Moved more to pre of submitForm