retrofit some code to work with new auth style