Simplify stage2 logic