More Changes to index