Added changes of index-final