Ported changes over to the submission file.