Stage 4 stuff fixed