new changes before release v 2.0