Added trapping water to must redo