Refactor index for my needs