Updates for R2-1