Changes for Stage 2