updated part 2