Upgraded planner