Updated to use C*2.0