Filled out Water and cleaned up Zone1.