Update to 2.0b3