Made changes for Stage 4