Continued work on auth switch