added notification handling