added notifications and formatting