Updated to 0.8