Added agressive detector (not slower at all)