more change by r2_index

more change by r2_index