+ notification stuff is fixed