Now uses multiple regexes, one for each method