Changed to index only living in memory