right before converting totally to oauth
Oauth implemented