add some indexing
indexing v2
Merge pull request #323 from CruGlobal/EVENT-163

add some indexing