finished part 4
merged