Added notifications +Bug Fix