Watersmart 398

Same as above, we need to have another discussion on this probably.