Updated to 2.0b7