REworking tileset 2 indexing