Added some regex, untested