change a use a regex instead of hard-coded