Rewrote the submit form processor