Adding in my edit for Part 1