Comprehensive plan ready for final draft