base changes for 2.0.0-wip