Planner & Rover FIX