swtich master to cpp-version