Refactor, use the SimpleBroadcaster