Fixed to use new oauth code