Final changes to Manager