updated matching classes