New version of form-handler