Water on the hill upgraded version