Updated Planner System