adding index finally :)
refactor