Upgrading to 0.9