added water class.