working on refactor of zone structure