Updating to include notifications and to handle content