added all and indexing changes