things are working except for the notification popup, before cleanup