Updated to 0.3x R2