Small changes which reguard to adjusting to push notification scheme