Updated for 0.8