Rework on Planning Module WIP