Issue 77 part 4.

Done.