moving stuff around for working authenticate in 1.6"