Updated my planner
Merged