Handle zone changes better