even better zone handling