removed the notifications -- too buggy