New indexes
Sorted out merge conflict