put manual indexing back because we might need it