move waterfountains data into here as well