upd mediator

make it clean an simple