cp1 final version from CJ