Added the indexing logic back in.