Revision History
7/19/11EMJ
Updated with James' comments