[Merge]from version 1.0 to 2.0