3.0.0 wip up to date