notification strings merged

and code modified