Watersmart 198

Responding to Ivan's feedback.