updated for auth merge