updated indexing, and invocation details