#39 switched back ot single indexing