changed to Peter's new 2D design