Switch to a mediator pattern