More work in notifications