adding water distribution points from Werner
merging stuff