changes for 2.0.x