[Update] Zoning
[Remove] Code that was deleted