merged corr2 branch