switch to 2.x API