Finished WaterModelingForm sec. adjust