Index controller modifications