include index, refactor