Fixed index so it's almost done