some changes for auth