2c and 2d partially working