fixed all part 2