Last commit for part 1