More updates for R2-0