Added all refrences
merge conflict solved