CupClass modified