Update to 0.8 code