Index changes
Merge fix