Updated notifications as per PR comments