Sparrow api changes per discussion with Jer-Jer