Final changes before handing