pt2 of the last commit