Updated regex system and word list