New merge boss_stage, should use this one now