Made changes to get app to run with mediator