updated for v2.0.0._RC1