Refactored code so that all indexes have same view
Experimenting...