Tweak the analysis logic