2d and 3d working now