Update to have notifications and cleanup