amended order regarding plaintiffs subclasses