ISSUE-36-2-thumb

Ram Tracks Issue 36-2