Last Commit for Part III