added notifications and save functionality