Updated ThePlan with recent changes