changes to fix indexes