Rework the submit operation

No match.