Change to using new 2D implementation