Started v2 rework.