TED 10: Match class needs a makeover