Renamed 2d to index