Added index
Trying to merge this and having issues.