Updated stage 2 again