make changes to prototype for testing with indexer