Made changes for Part 2