Reworked submission using pre_save and post_save