FINALLY FIXED NOTIFICATION SYSTEM