More reasonable water geometry