added mediator and command
not much change