Update for R2.0