Switched completely to 2D