Updated for 0.6