Move into on_submit()