Changes to indextable method