Water in 4.x