Added more Zone logic.