changed zoneId generation