#200: Wrapping up part 6

#200: Wrapping up part 6