started editing to match new regular expressions