v2 rework