authentication fixed
merge