Comprehensive Plan update