replaced original indexing methods with alternate implementation