opps on modelRegex, changed to makeRegex