WIP upgrade to 0.7