diff --git a/configuration/messageproperties/messages_en.properties b/configuration/messageproperties/messages_en.properties
index c1f7ac98..162eaa4d 100644
--- a/configuration/messageproperties/messages_en.properties
+++ b/configuration/messageproperties/messages_en.properties
@@ -931,6 +931,22 @@ pihcore.location.surgery=Surgery department
 pihcore.location.intMed=Internal medicine
 pihcore.location.ed=Emergency department
 
+pihcore.mentalhealth.thoughtProcess=Thought Process
+pihcore.thoughtcontent.delusion=Delusions
+pihcore.thoughtcontent.homicidal=Denies homicidal ideation
+pihcore.thoughtcontent.suicidal=Denies suicidal ideation
+pihcore.thoughtcontent.negativism=Negativism
+pihcore.thoughtcontent.paranoid=Paranoid delusion
+
+pihcore.thoughtprocess.looseness=Associative looseness
+pihcore.thoughtprocess.circonf=Circumferential thought process
+pihcore.thoughtprocess.flight=Flight of ideas
+pihcore.thoughtprocess.goal=Goal-oriented
+pihcore.thoughtprocess.linearthought=Linear thought process
+pihcore.thoughtprocess.tangential=Tangential thinking
+pihcore.thoughtprocess.blocking=Thought blocking
+
+
 pihcore.consult.returnVisitDate=Return visit date
 pihcore.consult.clinicalImpressions=Clinical Impressions
 pihcore.consult.clinicalManagementPlan=Clinical Management Plan
@@ -1545,6 +1561,11 @@ pihcore.mentalhealth.suicidal=Danger to self, suicidal
 pihcore.mentalhealth.phobia=Anxiety,phobia
 pihcore.mentalhealth.Psychosocial=Psychosocial evaluation
 pihcore.mentalhealth.TraumaticEvent=Traumatic event
+pihcore.mentalhealth.judgement=Judgement
+pihcore.mentalhealth.affect=Affect
+pihcore.mentalhealth.danger=Danger to others
+pihcore.mentalhealth.examination=Mental Health Examination
+
 
 pihcore.vct=Counseling and Testing (CT)
 pihcore.screening=Reason for screening
diff --git a/configuration/messageproperties/messages_fr.properties b/configuration/messageproperties/messages_fr.properties
index 5f2897e6..6f600655 100644
--- a/configuration/messageproperties/messages_fr.properties
+++ b/configuration/messageproperties/messages_fr.properties
@@ -1296,12 +1296,31 @@ pihcore.mentalhealth.cognitive=Fonction cognitive (dans les limites normales)
 pihcore.mentalhealth.mood=Trouble de l'humeur
 pihcore.mentalhealth.muscleTone=Tonus musculaire et force
 
+pihcore.thoughtcontent.delusion=Délires paranormaux
+pihcore.thoughtcontent.homicidal=Nie une idéation homicide
+pihcore.thoughtcontent.suicidal=Nie une idéation suicidaire
+pihcore.thoughtcontent.negativism=Négativisme
+pihcore.thoughtcontent.paranoid=Délire paranoïaque
+pihcore.mentalhealth.thoughtProcess=Processus de pensée
+
+pihcore.thoughtprocess.looseness=Relâchement associatif
+pihcore.thoughtprocess.circonf=Processus de pensée circonférentiel
+pihcore.thoughtprocess.flight=Fuite des idées
+pihcore.thoughtprocess.goal=Orienté vers un but
+pihcore.thoughtprocess.linearthought=Processus de pensée linéaire
+pihcore.thoughtprocess.tangential=Pensée tangentielle
+pihcore.thoughtprocess.blocking=Blocage de la pensée
+
 pihcore.mentalhealth.introspection=Introspection
 pihcore.mentalhealth.ThoughtContent=Contenu de la pensée dans les limites normales
 pihcore.mentalhealth.suicidal=Danger pour soi-même, suicidaire
 pihcore.mentalhealth.phobia=Anxiété, phobie
 pihcore.mentalhealth.Psychosocial=Évaluation psychosociale
-pihcore.mentalhealth.TraumaticEvent=Evenement traumatique
+pihcore.mentalhealth.TraumaticEvent=Evénement traumatique
+pihcore.mentalhealth.judgement=Jugement
+pihcore.mentalhealth.affect=Affecter
+pihcore.mentalhealth.danger=Danger pour les autres
+pihcore.mentalhealth.examination=Examen de santé mentale
 
 pihcore.weeks=semaines
 pihcore.new=Nouvelle
diff --git a/configuration/pih/htmlforms/mentalHealth.xml b/configuration/pih/htmlforms/mentalHealth.xml
index f44d0297..ac826f9b 100644
--- a/configuration/pih/htmlforms/mentalHealth.xml
+++ b/configuration/pih/htmlforms/mentalHealth.xml
@@ -815,15 +815,16 @@
                 </p>
 
             </div>
-<!--            <div class="col">-->
-<!--                <p>-->
-<!--                    <label>-->
-<!--                        <uimessage code="pihcore.mentalhealth.ThoughtContent"/>-->
-<!--                    </label>-->
-<!--                    <obs conceptId="CIEL:167112" style="checkbox"  answerSeparator=""/>-->
-<!--                </p>-->
-
-<!--            </div>-->
+            <div class="col">
+                <p>
+                    <label>
+                        <uimessage code="pihcore.mentalhealth.ThoughtContent"/>
+                    </label>
+                    <obs conceptId="CIEL:167112" style="radio"  answerSeparator="" answerCodes="pihcore.thoughtcontent.delusion,pihcore.thoughtcontent.homicidal,pihcore.thoughtcontent.suicidal,pihcore.thoughtcontent.negativism,pihcore.thoughtcontent.paranoid"/>
+                </p>
+
+            </div>
+
         </div>
 
         <div class="section-container" id="radio_button_container">
@@ -860,9 +861,64 @@
 
             </div>
 
+            <div class="col">
+                <p>
+                    <label>
+                        <uimessage code="pihcore.mentalhealth.judgement"/>
+                    </label>
+                    <obs conceptId="CIEL:167116" style="radio" answerConceptIds="PIH:1897,CIEL:159406,CIEL:159407"  answerSeparator=""/>
+                </p>
+
+            </div>
+
+        </div>
+        <!-- No Concept Yet-->
+        <div class="section-container" id="radio_button_container">
+
+            <div class="col">
+                <p>
+                    <label>
+                        <uimessage code="pihcore.mentalhealth.danger"/>
+                    </label>
+                    <obs conceptId="PIH:15106" style="radio" answerConceptIds="PIH:YES,PIH:NO" answerSeparator=""/>
+                </p>
+
+            </div>
+
+            <div class="col">
+                <p>
+                    <label>
+                        <uimessage code="pihcore.mentalhealth.affect"/>
+                    </label>
+                    <obs conceptId="CIEL:167101" style="radio" answerConceptIds="PIH:NORMAL,PIH:ABNORMAL"   answerSeparator=""/>
+                </p>
+
+            </div>
+
         </div>
 
+        <div class="section-container" id="radio_button_container">
+
+            <div class="col">
+                <p>
+                    <label>
+                        <uimessage code="pihcore.mentalhealth.examination"/>
+                    </label>
+                    <obs conceptId="CIEL:163044" type="textarea"/>
+                </p>
+            </div>
+
+            <div class="col">
+                <p>
+                    <label>
+                        <uimessage code="pihcore.mentalhealth.thoughtProcess"/>
+                    </label>
+                    <obs conceptId="CIEL:167106" style="checkbox" answerCodes="pihcore.thoughtprocess.looseness,pihcore.thoughtprocess.circonf,pihcore.thoughtprocess.flight,pihcore.thoughtprocess.goal,pihcore.thoughtprocess.linearthought,pihcore.thoughtprocess.tangential,pihcore.thoughtprocess.blocking"/>
+                </p>
 
+            </div>
+
+        </div>
     </section>
 
     <section id="mh-suicide" sectionTag="fieldset" headerTag="legend" headerStyle="title"