Final Commit Part 2