#47 Tidied up section use case
#47 Tidied up use case 16 a bit