Final commit for part I