add scopes, correct states