DJR:Corrected subclass type
DJR:Revised forms