Merged the changes with auth