Updated to 2.0 RC1