Final changes to match submission to 3rd party team.