Added notification receiver NOT TESTED
merge fixing