make oauth version a bit more efficient