Modification to adapt to the new submission format.