v2 initial commit code review changes