Changed Random counter
Refactored mediator