Lines added for r2_index