New handling of configuration. Now uses Regex.
forget to change