Final changes for Stage 1