migrate to 0.7.0 - not yet tested!