Final changes before sending off for review