Adjusted notification handling