Fixed bug, added notification status