Added zone override checking, and extended functionality