Updated with push notification