#201: Wrapping up part 7

#201: Wrapping up part 7