preparing v2.0 (wip)