Updated zone controller for new use case