Modfied Index & add some information