fixing up the other subclasses