added notifications // old implementation