better structure for branch r2_index