Final changes before defense