Final commit on part A