Adding notifications
Remove temp code.