Updated for desktop notifications