Waters check (19/28)

Waters check