Changes for part 3