moved stuff in auth