General Plan Update and Zoning Map Amendment