0.6.0 upgrade