even faster - extraced NnWater class