begin refactor for v2