PLANNER-73 Implementation