JT-103 Committed after adding modifications suggested during JT-104
review...