Issue 16 June 6

Issue 16 June 6