Final set of changes before submission