rework zone handler. break every example expect naked one.