modify cp.go and cp_test.go