fast match was implemented for FMCS. cosmetic changes