Pre Merge
Added list_indices