Extended the zone range detection