Modify WaterModelingForm 2