notification strings merged

and code updated