Added IAFD search first, less memory usage, regex update