Changed the way auth is used