Update for 0.3z R2-4