stopped constantly setting values
merged conflicts for water state