updating to work in 2.x