Updated to 0.7