Updated to use 2.0rc1