Refactor with v3