V2 After code review