Auth changes, needs testing.