trigger renamed to notify
minor error fixed
full mediator refactoring