removed alerts and implemented notifications