auth changes
merge xz