Stage 2 & 3 updates