Updated with notifications