auth added
merge auth