Now fully using new authentication