changed stuff to 2d