Working on removing the condition regex, too.
Got rid of another regex.