removed water check again.. was not a good idea this way