Updated Context Aware Planner