Updated push notification logic

Updated push notification logic