Update the plan system
Fxed merge