Updating to 0.8