Final changes before hand-in