Updated to 2.0 alpha 1