notification module improved