more index refactor