v2-beta rework