Shorts - Issue 16

Issue 16 1