Zones assigned. Code cleaned up