my zone heavily refactored