refactoring wip - index2