Updated CC2D