added notifications, sorting, etc