a lot of changes and oauth