Merge version 2.0