final commit for part 1