eigen1 changed for r2_index branch