Enhance fir must use count values