Updated with notifications and UI updates