update to WIP 3.0.0 branch