16 Commits (fixAuth)