#196: Wrapping up part 2

#196: Wrapping up part 2