mediator : some fix/modifications