Comprehensive Plan Update working group