Mods to the Submit class