partial edit part 3