updated to support configurable zone