I made changes for parts 2 and 3.