combined version2.0