All regexs and emily's changes rolled in