TGTrinity - Issue 18

Issue 18 1
Issue 18 2
Issue 18 3