updating class and initial set_up flow to v2