Switched to EventBus from greenrobot
Removed dropping on refresh
Changes for the server