Updated for 2.0rc