Updated to reflect 0.8