3.0.0 wip update