final commit pt2
pt3