working with notifications and fixes for upgrade