more v2.0.0 stuff [skip ci]