Some nice updates to 2c.