improvements to plan feature