Implemented the required form changes