Rest of Stages were refactored