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