Improve the planning