Modified for Part 2