changed to 2d