Removed testing clause for notifications