Moved index to correct place