removed the notification stuff. did not work that well