token indexes
improved token indexes