Major update for part 3