Final modifications done with validations