refactored zones