reverted refactor of index