adding index
remove old
Merge to inherit history