Upgrade to nw 0.7