added notifications, still work to be done