Salavaged Notification polling logic for Issue #560