Final commit for Part A