update index changes

sync changes from comus