diff --git a/src/main/resources/medtaggerieresources/pasc/regexp/resources_regexp_reCHESTPAIN.txt b/src/main/resources/medtaggerieresources/pasc/regexp/resources_regexp_reCHESTPAIN.txt
index ead369f..7199e42 100755
--- a/src/main/resources/medtaggerieresources/pasc/regexp/resources_regexp_reCHESTPAIN.txt
+++ b/src/main/resources/medtaggerieresources/pasc/regexp/resources_regexp_reCHESTPAIN.txt
@@ -1,5 +1,3 @@
 thoratic pain
 chest (pain|discomfort)\w{0,5}
-(tight\w{0,5}|pain)(\s+\S+){0,5}\s*(chest|breath\w{0,5})
-
-
+(tight\w{0,5}|pain)(\s+\S+){0,2}\s*(chest|breath\w{0,5})
\ No newline at end of file
diff --git a/src/main/resources/medtaggerieresources/pasc/regexp/resources_regexp_reDYSPNEA.txt b/src/main/resources/medtaggerieresources/pasc/regexp/resources_regexp_reDYSPNEA.txt
index 41d3bcb..7f2db15 100755
--- a/src/main/resources/medtaggerieresources/pasc/regexp/resources_regexp_reDYSPNEA.txt
+++ b/src/main/resources/medtaggerieresources/pasc/regexp/resources_regexp_reDYSPNEA.txt
@@ -6,7 +6,7 @@ pant\w{0,5}
 hyperpnea
 gasp\w{0,5}
 breathing fast
-(fast|trouble|abnormal|increas\w{0,5}|rapid|difficult\w{0,2}|short\w{0,5})(\s+\S+){0,5}\s*breath\w{0,5}
+(fast|trouble|abnormal|increas\w{0,5}|rapid|difficult\w{0,2}|short\w{0,5})(\s+\S+){0,2}\s*breath\w{0,5}
 breathing difficulty
 feel(\s+\S+){0,3}\s*suffocat\w{0,5}
 suffocat\w{0,5}(\s+\S+){0,5}\s*feel\w{0,5}
diff --git a/src/main/resources/medtaggerieresources/pasc/rules/resources_rules_matchrules.txt b/src/main/resources/medtaggerieresources/pasc/rules/resources_rules_matchrules.txt
index 56db7ed..4d4a294 100644
--- a/src/main/resources/medtaggerieresources/pasc/rules/resources_rules_matchrules.txt
+++ b/src/main/resources/medtaggerieresources/pasc/rules/resources_rules_matchrules.txt
@@ -111,7 +111,7 @@ RULENAME="cm_SLEEPDISORDER",REGEXP="\b(impaired(\s+\S+){0,2}\s*ability to sleep|
 RULENAME="cm_OXYGENDESATURATION",REGEXP="\b(desaturation\w?(\s+\S+){0,2}\s*oxygen|oxygen saturation\w?(\s+\S+){0,2}\s*drop)",LOCATION="NA",NORM="4042079"
 
 #Word finding difficulty
-RULENAME="cm_WORDFINDING",REGEXP="\b(word finding difficutly|difficulty in word finding)",LOCATION="NA",NORM="4047125"
+RULENAME="cm_WORDFINDING",REGEXP="\b(word finding difficutly|difficulty in word finding)",LOCATION="NA",NORM="4304008"
 
 #Abnormal bowel movement
 RULENAME="cm_ABNORMALBOWEL",REGEXP="\b(alternat\w{0,5} bowel habits|irregular bowel movement\w{0,1})",LOCATION="NA",NORM="4047125"
@@ -179,7 +179,7 @@ RULENAME="cm_DIFFICULTYINITIATESLEEP",REGEXP="\b(difficulty(\s+\S+){0,2}\s*initi
 RULENAME="cm_AIRFLOWISSUE",REGEXP="\b(airflow restriction)",LOCATION="NA",NORM="4245492"
 
 #Abnormal heart rate
-RULENAME="cm_ABNORMALHEARTRATE",REGEXP="\b(heart rate(\s+\S+){0,1}\s*(does shoot|jumped|go) up|labile heart rate\w{0,1}|elevated hr)",LOCATION="NA",NORM="4245492"
+RULENAME="cm_ABNORMALHEARTRATE",REGEXP="\b(heart rate(\s+\S+){0,1}\s*(does shoot|jumped|go) up|labile heart rate\w{0,1}|elevated hr)",LOCATION="NA",NORM="4262561"
 
 #Dyspnea
 RULENAME="cm_DYSPNEA",REGEXP="\b((cannot catch|getting out of|difficulty catching)(\s+\S+){0,1}\s*breath)",LOCATION="NA",NORM="4263848"