#197: Wrapping up part 3

#197: Wrapping up part 3