redid regexp practice actually  using regexps
fixed merge conflict