Final changes before squash