PLANNER-205

Simplified