Update for R2