Updates by water and energy

water and energy