Replaced the notification listened for to remove lag