Un-commented the water stuff since it is in the db now