2014/04/07 morris modify class header and method