Part 2 Commit
Part 2 Updated