Moved index outisde of source