Final changes for submission