fixed: small changes for zone2 (doesn't work)