working on indexing issues