diff --git a/boranga/components/occurrence/api.py b/boranga/components/occurrence/api.py
index 628342e3..383f8605 100644
--- a/boranga/components/occurrence/api.py
+++ b/boranga/components/occurrence/api.py
@@ -76,6 +76,8 @@
     Location,
     ObserverDetail,
     OccurrenceReportDocument,
+    OCRConservationThreat,
+    OccurrenceReportUserAction,
 )
 from boranga.components.occurrence.serializers import(
     ListOccurrenceReportSerializer,
@@ -97,6 +99,8 @@
     OccurrenceReportLogEntrySerializer,
     OccurrenceReportDocumentSerializer,
     SaveOccurrenceReportDocumentSerializer,
+    OCRConservationThreatSerializer,
+    SaveOCRConservationThreatSerializer,
 )
 
 from boranga.components.occurrence.utils import (
@@ -1076,6 +1080,25 @@ def documents(self, request, *args, **kwargs):
         except Exception as e:
             print(traceback.print_exc())
             raise serializers.ValidationError(str(e))
+    
+    @detail_route(methods=['GET',], detail=True)
+    def threats(self, request, *args, **kwargs):
+        try:
+            instance = self.get_object()
+            # TODO Do we need to sort the threats for external user (similar like documents)
+            qs = instance.ocr_threats.all()
+            qs = qs.order_by('-date_observed')
+            serializer = OCRConservationThreatSerializer(qs,many=True, context={'request':request})
+            return Response(serializer.data)
+        except serializers.ValidationError:
+            print(traceback.print_exc())
+            raise
+        except ValidationError as e:
+            print(traceback.print_exc())
+            raise serializers.ValidationError(repr(e.error_dict))
+        except Exception as e:
+            print(traceback.print_exc())
+            raise serializers.ValidationError(str(e))
 
 
 class ObserverDetailViewSet(viewsets.ModelViewSet):
@@ -1157,32 +1180,118 @@ def reinstate(self, request, *args, **kwargs):
             raise serializers.ValidationError(str(e))
     
     def update(self, request, *args, **kwargs):
+        try:
+            with transaction.atomic():
+                instance = self.get_object()
+                serializer = SaveOccurrenceReportDocumentSerializer(instance, data=json.loads(request.data.get('data')))
+                serializer.is_valid(raise_exception=True)
+                serializer.save()
+                instance.add_documents(request)
+                instance.uploaded_by = request.user.id
+                instance.save()
+                return Response(serializer.data)
+        except Exception as e:
+            print(traceback.print_exc())
+            raise serializers.ValidationError(str(e))
+
+
+    def create(self, request, *args, **kwargs):
+        try:
+            with transaction.atomic():
+                serializer = SaveOccurrenceReportDocumentSerializer(data= json.loads(request.data.get('data')))
+                serializer.is_valid(raise_exception = True)
+                instance = serializer.save()
+                instance.add_documents(request)
+                instance.uploaded_by = request.user.id
+                instance.save()
+                return Response(serializer.data)
+        except serializers.ValidationError:
+            print(traceback.print_exc())
+            raise
+        except ValidationError as e:
+            if hasattr(e,'error_dict'):
+                raise serializers.ValidationError(repr(e.error_dict))
+            else:
+                if hasattr(e,'message'):
+                    raise serializers.ValidationError(e.message)
+        except Exception as e:
+            print(traceback.print_exc())
+            raise serializers.ValidationError(str(e))
+
+
+class OCRConservationThreatViewSet(viewsets.ModelViewSet):
+    queryset = OCRConservationThreat.objects.all().order_by('id')
+    serializer_class = OCRConservationThreatSerializer
+
+    @detail_route(methods=['GET',], detail=True)
+    def discard(self, request, *args, **kwargs):
         try:
             instance = self.get_object()
-            serializer = SaveOccurrenceReportDocumentSerializer(instance, data=json.loads(request.data.get('data')))
-            serializer.is_valid(raise_exception=True)
-            serializer.save()
-            instance.add_documents(request)
-            instance.uploaded_by = request.user.id
+            instance.visible = False
             instance.save()
+            if instance.occurrence_report:
+                instance.occurrence_report.log_user_action(OccurrenceReportUserAction.ACTION_DISCARD_THREAT.format(instance.threat_number,instance.occurrence_report.occurrence_report_number),request)
+            serializer = self.get_serializer(instance)
             return Response(serializer.data)
+        except serializers.ValidationError:
+            print(traceback.print_exc())
+            raise
+        except ValidationError as e:
+            print(traceback.print_exc())
+            raise serializers.ValidationError(repr(e.error_dict))
         except Exception as e:
             print(traceback.print_exc())
             raise serializers.ValidationError(str(e))
 
-
-    def create(self, request, *args, **kwargs):
+    @detail_route(methods=['GET',], detail=True)
+    def reinstate(self, request, *args, **kwargs):
         try:
-            serializer = SaveOccurrenceReportDocumentSerializer(data= json.loads(request.data.get('data')))
-            serializer.is_valid(raise_exception = True)
-            instance = serializer.save()
-            instance.add_documents(request)
-            instance.uploaded_by = request.user.id
+            instance = self.get_object()
+            instance.visible = True
             instance.save()
+            if instance.occurrence_report:
+                instance.occurrence_report.log_user_action(OccurrenceReportUserAction.ACTION_REINSTATE_THREAT.format(instance.threat_number,instance.occurrence_report.occurrence_report_number),request)
+            serializer = self.get_serializer(instance)
             return Response(serializer.data)
         except serializers.ValidationError:
             print(traceback.print_exc())
             raise
+        except ValidationError as e:
+            print(traceback.print_exc())
+            raise serializers.ValidationError(repr(e.error_dict))
+        except Exception as e:
+            print(traceback.print_exc())
+            raise serializers.ValidationError(str(e))
+
+    def update(self, request, *args, **kwargs):
+        try:
+            with transaction.atomic():
+                instance = self.get_object()
+                serializer = SaveOCRConservationThreatSerializer(instance, data=json.loads(request.data.get('data')))
+                serializer.is_valid(raise_exception=True)
+                serializer.save()
+                if instance.occurrence_report:
+                    instance.occurrence_report.log_user_action(OccurrenceReportUserAction.ACTION_UPDATE_THREAT.format(instance.threat_number,instance.occurrence_report.occurrence_report_number),request)
+                serializer = self.get_serializer(instance)
+                return Response(serializer.data)
+        except Exception as e:
+            print(traceback.print_exc())
+            raise serializers.ValidationError(str(e))
+
+
+    def create(self, request, *args, **kwargs):
+        try:
+            with transaction.atomic():
+                serializer = SaveOCRConservationThreatSerializer(data= json.loads(request.data.get('data')))
+                serializer.is_valid(raise_exception = True)
+                instance = serializer.save()
+                if instance.occurrence_report:
+                    instance.occurrence_report.log_user_action(OccurrenceReportUserAction.ACTION_ADD_THREAT.format(instance.threat_number,instance.occurrence_report.occurrence_report_number),request)
+                serializer = self.get_serializer(instance)
+                return Response(serializer.data)
+        except serializers.ValidationError:
+            print(traceback.print_exc())
+            raise
         except ValidationError as e:
             if hasattr(e,'error_dict'):
                 raise serializers.ValidationError(repr(e.error_dict))
diff --git a/boranga/components/occurrence/models.py b/boranga/components/occurrence/models.py
index cd3c9e9f..08d49a03 100644
--- a/boranga/components/occurrence/models.py
+++ b/boranga/components/occurrence/models.py
@@ -38,6 +38,11 @@
     GroupType,
     Species,
     Community,
+    ThreatCategory,
+    ThreatAgent,
+    PotentialImpact,
+    PotentialThreatOnset,
+    CurrentImpact,
 )
 from boranga.components.conservation_status.models import ConservationStatus
 from boranga.ordered_model import OrderedModel
@@ -423,6 +428,18 @@ class OccurrenceReportUserAction(UserAction):
     COMMENT_REFERRAL = "Referral {} for occurrence report proposal {} has been commented by {}"
     CONCLUDE_REFERRAL = "Referral {} for occurrence report proposal {} has been concluded by {}"
 
+     # Document
+    ACTION_ADD_DOCUMENT= "Document {} added for occurrence report {}"
+    ACTION_UPDATE_DOCUMENT= "Document {} updated for occurrence report {}"
+    ACTION_DISCARD_DOCUMENT= "Document {} discarded for occurrence report {}"
+    ACTION_REINSTATE_DOCUMENT= "Document {} reinstated for occurrence report {}"
+
+    # Threat
+    ACTION_ADD_THREAT= "Threat {} added for occurrence report {}"
+    ACTION_UPDATE_THREAT= "Threat {} updated for occurrence report {}"
+    ACTION_DISCARD_THREAT= "Threat {} discarded for occurrence report {}"
+    ACTION_REINSTATE_THREAT= "Threat {} reinstated for occurrence report {}"
+
 
     class Meta:
         app_label = 'boranga'
@@ -1280,3 +1297,46 @@ def add_documents(self, request):
             except:
                 raise
         return
+
+class OCRConservationThreat(models.Model):
+    """
+    Threat for a occurrence_report in a particular location.
+
+    NB: Maybe make many to many
+
+    Has a:
+    - occurrence_report
+    Used for:
+    - OccurrenceReport
+    Is:
+    - Table
+    """
+    occurrence_report = models.ForeignKey(OccurrenceReport, on_delete=models.CASCADE, null=True, blank=True , related_name="ocr_threats")
+    threat_number = models.CharField(max_length=9, blank=True, default='')
+    threat_category = models.ForeignKey(ThreatCategory, on_delete=models.CASCADE, default=None, null=True, blank=True)
+    threat_agent = models.ForeignKey(ThreatAgent, on_delete=models.SET_NULL, default=None, null=True, blank=True)
+    current_impact = models.ForeignKey(CurrentImpact, on_delete=models.SET_NULL, default=None, null=True, blank=True)
+    potential_impact = models.ForeignKey(PotentialImpact, on_delete=models.SET_NULL, default=None, null=True, blank=True)
+    potential_threat_onset = models.ForeignKey(PotentialThreatOnset, on_delete=models.SET_NULL, default=None, null=True, blank=True)
+    comment = models.CharField(max_length=512,
+                               default="None")
+    date_observed = models.DateField(blank =True, null=True)
+    visible = models.BooleanField(default=True) # to prevent deletion, hidden and still be available in history
+
+
+    class Meta:
+        app_label = 'boranga'
+
+    def __str__(self):
+        return str(self.id)  # TODO: is the most appropriate?
+
+    def save(self, *args, **kwargs):
+        super(OCRConservationThreat, self).save(*args,**kwargs)
+        if self.threat_number == '':
+            new_threat_id = 'T{}'.format(str(self.pk))
+            self.threat_number = new_threat_id
+            self.save()
+
+    @property
+    def source(self):
+        return self.occurrence_report.id
diff --git a/boranga/components/occurrence/serializers.py b/boranga/components/occurrence/serializers.py
index d4383e6d..11acd886 100644
--- a/boranga/components/occurrence/serializers.py
+++ b/boranga/components/occurrence/serializers.py
@@ -29,6 +29,7 @@
     OccurrenceReportLogEntry,
     OccurrenceReportUserAction,
     OccurrenceReportDocument,
+    OCRConservationThreat,
     )
 
 from boranga.components.users.serializers import UserSerializer
@@ -941,3 +942,74 @@ class Meta:
 			'document_sub_category',
             )
 
+
+class OCRConservationThreatSerializer(serializers.ModelSerializer):
+	threat_category = serializers.SerializerMethodField()
+	threat_agent = serializers.SerializerMethodField()
+	current_impact_name = serializers.SerializerMethodField()
+	potential_impact_name = serializers.SerializerMethodField()
+	potential_threat_onset_name = serializers.SerializerMethodField()
+	class Meta:
+		model = OCRConservationThreat
+		fields = (
+			'id',
+			'threat_number',
+			'threat_category_id',
+			'threat_category',
+			'threat_agent',
+			'threat_agent_id',
+			'current_impact',
+			'current_impact_name',
+			'potential_impact',
+			'potential_impact_name',
+			'potential_threat_onset',
+			'potential_threat_onset_name',
+			'comment',
+			'date_observed',
+			'source',
+			'occurrence_report',
+			'visible',
+		)
+		read_only_fields = ('id','threat_number',)
+
+	def get_threat_category(self,obj):
+		if obj.threat_category:
+			return obj.threat_category.name
+	
+	def get_threat_agent(self,obj):
+		if obj.threat_agent:
+			return obj.threat_agent.name
+
+	def get_current_impact_name(self,obj):
+		if obj.current_impact:
+			return obj.current_impact.name
+
+	def get_potential_impact_name(self,obj):
+		if obj.potential_impact:
+			return obj.potential_impact.name
+
+	def get_potential_threat_onset_name(self,obj):
+		if obj.potential_threat_onset:
+			return obj.potential_threat_onset.name
+
+
+class SaveOCRConservationThreatSerializer(serializers.ModelSerializer):
+
+    threat_category_id = serializers.IntegerField(required=False, allow_null=True, write_only= True)
+    threat_agent_id = serializers.IntegerField(required=False, allow_null=True, write_only= True)
+    date_observed = serializers.DateField(format='%Y-%m-%d', required=False, allow_null = True)
+
+    class Meta:
+        model = OCRConservationThreat
+        fields = (
+			'id',
+			'occurrence_report',
+			'threat_category_id',
+			'threat_agent_id',
+			'comment',
+			'current_impact',
+			'potential_impact',
+			'potential_threat_onset',
+			'date_observed',
+			)
+
diff --git a/boranga/components/species_and_communities/api.py b/boranga/components/species_and_communities/api.py
index fdf90248..f984c50f 100755
--- a/boranga/components/species_and_communities/api.py
+++ b/boranga/components/species_and_communities/api.py
@@ -1910,13 +1910,14 @@ def reinstate(self, request, *args, **kwargs):
 
     def update(self, request, *args, **kwargs):
         try:
-            instance = self.get_object()
-            serializer = SaveSpeciesDocumentSerializer(instance, data=json.loads(request.data.get('data')))
-            serializer.is_valid(raise_exception=True)
-            serializer.save()
-            instance.add_documents(request)
-            instance.species.log_user_action(SpeciesUserAction.ACTION_UPDATE_DOCUMENT.format(instance.document_number,instance.species.species_number),request)
-            return Response(serializer.data)
+            with transaction.atomic():
+                instance = self.get_object()
+                serializer = SaveSpeciesDocumentSerializer(instance, data=json.loads(request.data.get('data')))
+                serializer.is_valid(raise_exception=True)
+                serializer.save()
+                instance.add_documents(request)
+                instance.species.log_user_action(SpeciesUserAction.ACTION_UPDATE_DOCUMENT.format(instance.document_number,instance.species.species_number),request)
+                return Response(serializer.data)
         except Exception as e:
             print(traceback.print_exc())
             raise serializers.ValidationError(str(e))
@@ -1924,12 +1925,13 @@ def update(self, request, *args, **kwargs):
 
     def create(self, request, *args, **kwargs):
         try:
-            serializer = SaveSpeciesDocumentSerializer(data= json.loads(request.data.get('data')))
-            serializer.is_valid(raise_exception = True)
-            instance = serializer.save()
-            instance.add_documents(request)
-            instance.species.log_user_action(SpeciesUserAction.ACTION_ADD_DOCUMENT.format(instance.document_number,instance.species.species_number),request)
-            return Response(serializer.data)
+            with transaction.atomic():
+                serializer = SaveSpeciesDocumentSerializer(data= json.loads(request.data.get('data')))
+                serializer.is_valid(raise_exception = True)
+                instance = serializer.save()
+                instance.add_documents(request)
+                instance.species.log_user_action(SpeciesUserAction.ACTION_ADD_DOCUMENT.format(instance.document_number,instance.species.species_number),request)
+                return Response(serializer.data)
         except serializers.ValidationError:
             print(traceback.print_exc())
             raise
@@ -2005,13 +2007,14 @@ def reinstate(self, request, *args, **kwargs):
 
     def update(self, request, *args, **kwargs):
         try:
-            instance = self.get_object()
-            serializer = SaveCommunityDocumentSerializer(instance, data=json.loads(request.data.get('data')))
-            serializer.is_valid(raise_exception=True)
-            serializer.save()
-            instance.add_documents(request)
-            instance.community.log_user_action(CommunityUserAction.ACTION_UPDATE_DOCUMENT.format(instance.document_number,instance.community.community_number),request)
-            return Response(serializer.data)
+            with transaction.atomic():
+                instance = self.get_object()
+                serializer = SaveCommunityDocumentSerializer(instance, data=json.loads(request.data.get('data')))
+                serializer.is_valid(raise_exception=True)
+                serializer.save()
+                instance.add_documents(request)
+                instance.community.log_user_action(CommunityUserAction.ACTION_UPDATE_DOCUMENT.format(instance.document_number,instance.community.community_number),request)
+                return Response(serializer.data)
         except Exception as e:
             print(traceback.print_exc())
             raise serializers.ValidationError(str(e))
@@ -2019,12 +2022,13 @@ def update(self, request, *args, **kwargs):
 
     def create(self, request, *args, **kwargs):
         try:
-            serializer = SaveCommunityDocumentSerializer(data= json.loads(request.data.get('data')))
-            serializer.is_valid(raise_exception = True)
-            instance = serializer.save()
-            instance.add_documents(request)
-            instance.community.log_user_action(CommunityUserAction.ACTION_ADD_DOCUMENT.format(instance.document_number,instance.community.community_number),request)
-            return Response(serializer.data)
+            with transaction.atomic():
+                serializer = SaveCommunityDocumentSerializer(data= json.loads(request.data.get('data')))
+                serializer.is_valid(raise_exception = True)
+                instance = serializer.save()
+                instance.add_documents(request)
+                instance.community.log_user_action(CommunityUserAction.ACTION_ADD_DOCUMENT.format(instance.document_number,instance.community.community_number),request)
+                return Response(serializer.data)
         except serializers.ValidationError:
             print(traceback.print_exc())
             raise
@@ -2127,7 +2131,6 @@ def reinstate(self, request, *args, **kwargs):
             elif instance.community:
                 instance.community.log_user_action(CommunityUserAction.ACTION_REINSTATE_THREAT.format(instance.threat_number,instance.community.community_number),request)
             serializer = self.get_serializer(instance)
-            serializer = self.get_serializer(instance)
             return Response(serializer.data)
         except serializers.ValidationError:
             print(traceback.print_exc())
@@ -2141,16 +2144,17 @@ def reinstate(self, request, *args, **kwargs):
 
     def update(self, request, *args, **kwargs):
         try:
-            instance = self.get_object()
-            serializer = SaveConservationThreatSerializer(instance, data=json.loads(request.data.get('data')))
-            serializer.is_valid(raise_exception=True)
-            serializer.save()
-            if instance.species:
-                instance.species.log_user_action(SpeciesUserAction.ACTION_UPDATE_THREAT.format(instance.threat_number,instance.species.species_number),request)
-            elif instance.community:
-                instance.community.log_user_action(CommunityUserAction.ACTION_UPDATE_THREAT.format(instance.threat_number,instance.community.community_number),request)
-            serializer = self.get_serializer(instance)
-            return Response(serializer.data)
+            with transaction.atomic():
+                instance = self.get_object()
+                serializer = SaveConservationThreatSerializer(instance, data=json.loads(request.data.get('data')))
+                serializer.is_valid(raise_exception=True)
+                serializer.save()
+                if instance.species:
+                    instance.species.log_user_action(SpeciesUserAction.ACTION_UPDATE_THREAT.format(instance.threat_number,instance.species.species_number),request)
+                elif instance.community:
+                    instance.community.log_user_action(CommunityUserAction.ACTION_UPDATE_THREAT.format(instance.threat_number,instance.community.community_number),request)
+                serializer = self.get_serializer(instance)
+                return Response(serializer.data)
         except Exception as e:
             print(traceback.print_exc())
             raise serializers.ValidationError(str(e))
@@ -2158,15 +2162,16 @@ def update(self, request, *args, **kwargs):
 
     def create(self, request, *args, **kwargs):
         try:
-            serializer = SaveConservationThreatSerializer(data= json.loads(request.data.get('data')))
-            serializer.is_valid(raise_exception = True)
-            instance = serializer.save()
-            if instance.species:
-                instance.species.log_user_action(SpeciesUserAction.ACTION_ADD_THREAT.format(instance.threat_number,instance.species.species_number),request)
-            elif instance.community:
-                instance.community.log_user_action(CommunityUserAction.ACTION_ADD_THREAT.format(instance.threat_number,instance.community.community_number),request)
-            serializer = self.get_serializer(instance)
-            return Response(serializer.data)
+            with transaction.atomic():
+                serializer = SaveConservationThreatSerializer(data= json.loads(request.data.get('data')))
+                serializer.is_valid(raise_exception = True)
+                instance = serializer.save()
+                if instance.species:
+                    instance.species.log_user_action(SpeciesUserAction.ACTION_ADD_THREAT.format(instance.threat_number,instance.species.species_number),request)
+                elif instance.community:
+                    instance.community.log_user_action(CommunityUserAction.ACTION_ADD_THREAT.format(instance.threat_number,instance.community.community_number),request)
+                serializer = self.get_serializer(instance)
+                return Response(serializer.data)
         except serializers.ValidationError:
             print(traceback.print_exc())
             raise
diff --git a/boranga/frontend/boranga/src/api.js b/boranga/frontend/boranga/src/api.js
index c9c9510f..a6fcb043 100644
--- a/boranga/frontend/boranga/src/api.js
+++ b/boranga/frontend/boranga/src/api.js
@@ -142,6 +142,7 @@ module.exports = {
     occurrence_report:"/api/occurrence_report",
     observer_detail:"/api/observer_detail.json",
     occurrence_report_documents:"/api/occurrence_report_documents.json",
+    ocr_threat:"/api/ocr_threat.json",
 
     //approvals_paginated:"/api/approvals/user_list_paginated/?format=datatables",
     //compliances_paginated:"/api/compliances/user_list_paginated/?format=datatables",
diff --git a/boranga/frontend/boranga/src/components/common/occurrence/ocr_documents.vue b/boranga/frontend/boranga/src/components/common/occurrence/ocr_documents.vue
index 950ab794..733b2dc4 100644
--- a/boranga/frontend/boranga/src/components/common/occurrence/ocr_documents.vue
+++ b/boranga/frontend/boranga/src/components/common/occurrence/ocr_documents.vue
@@ -4,7 +4,7 @@
             <small style="color: red;"><br>(Do not upload Management or Recovery Plans here)</small>
             <form class="form-horizontal" action="index.html" method="post">
                 <div class="col-sm-12">
-                    <div class="text-end">
+                    <div class="text-end" v-show="can_user_edit_doc">
                         <button type="button" class="btn btn-primary mb-2 " @click.prevent="newDocument">
                             <i class="fa-solid fa-circle-plus"></i>
                                 Add Document
@@ -39,6 +39,14 @@ export default {
                 type: Object,
                 required:true
             },
+            is_external:{
+              type: Boolean,
+              default: false
+            },
+            is_internal:{
+              type: Boolean,
+              default: false
+            },
         },
         data:function () {
             let vm = this;
@@ -172,12 +180,24 @@ export default {
                             data: "id",
                             mRender:function (data,type,full){
                                 let links = '';
-                                if(full.visible){
-                                    links +=  `<a href='#${full.id}' data-edit-document='${full.id}'>Edit</a><br/>`;
-                                    links += `<a href='#' data-discard-document='${full.id}'>Remove</a><br>`;
+                                // to restrict submitter to edit doc when the report is in workflow
+                                if(vm.can_user_edit_doc){
+                                    if(full.visible){
+                                        links +=  `<a href='#${full.id}' data-edit-document='${full.id}'>Edit</a><br/>`;
+                                        links += `<a href='#' data-discard-document='${full.id}'>Remove</a><br>`;
+                                    }
+                                    else{
+                                        links += `<a href='#' data-reinstate-document='${full.id}'>Reinstate</a><br>`;
+                                    }
                                 }
                                 else{
-                                    links += `<a href='#' data-reinstate-document='${full.id}'>Reinstate</a><br>`;
+                                    if(full.visible){
+                                        links +=  `<a href='#${full.id}'>Edit</a><br/>`;
+                                        links += `<a href='#'>Remove</a><br>`;
+                                    }
+                                    else{
+                                        links += `<a href='#'>Reinstate</a><br>`;
+                                    }
                                 }
                                 return links;
                             }
@@ -201,6 +221,10 @@ export default {
             DocumentDetail,
         },
         computed: {
+            // to restrict submitter to add doc when the report is in workflow
+            can_user_edit_doc: function(){
+                return this.is_external && this.occurrence_report_obj.customer_status=="Draft";
+            }
         },
         watch:{
             
diff --git a/boranga/frontend/boranga/src/components/common/occurrence/ocr_threats.vue b/boranga/frontend/boranga/src/components/common/occurrence/ocr_threats.vue
new file mode 100644
index 00000000..5581f164
--- /dev/null
+++ b/boranga/frontend/boranga/src/components/common/occurrence/ocr_threats.vue
@@ -0,0 +1,412 @@
+<template lang="html">
+    <div id="ocr_threats">
+        <FormSection :formCollapse="false" label="Threats" :Index="threatBody">
+            <form class="form-horizontal" action="index.html" method="post">
+                <div class="col-sm-12">
+                    <div class="text-end">
+                        <button :disabled="isReadOnly" type="button" class="btn btn-primary mb-2 " @click.prevent="newThreat">
+                            <i class="fa-solid fa-circle-plus"></i>
+                                Add Threat
+                        </button>
+                    </div>
+                </div>
+                <div>
+                    <datatable ref="threats_datatable" :id="panelBody" :dtOptions="threats_options"
+                    :dtHeaders="threats_headers"/>
+                </div>
+            </form>
+        </FormSection>
+        <ThreatDetail ref="threat_detail" @refreshFromResponse="refreshFromResponse" :url="ocr_threat_url"></ThreatDetail>
+    </div>
+</template>
+<script>
+import Vue from 'vue' 
+import datatable from '@vue-utils/datatable.vue';
+import ThreatDetail from '@/components/common/species_communities/add_threat.vue'
+import FormSection from '@/components/forms/section_toggle.vue';
+import {
+  api_endpoints,
+  helpers,
+}
+from '@/utils/hooks'
+
+
+export default {
+        name: 'OCRThreats',
+        props:{
+            occurrence_report_obj:{
+                type: Object,
+                required:true
+            },
+            // this prop is only send from split species form to make the original species readonly
+            is_readonly:{
+              type: Boolean,
+              default: false
+            },
+        },
+        data:function () {
+            let vm = this;
+            return{
+                uuid:0,
+                threatBody: "threatBody"+ vm._uid,
+                panelBody: "species-threats-"+ vm._uid,
+                values:null,
+                ocr_threat_url: api_endpoints.ocr_threat,
+                threats_headers:['Number','Category', 'Threat Source', 'Date Observed', 'Threat Agent', 'Comments',
+                                'Current Impact', 'Potential Impact','Action'],
+                threats_options:{
+                    autowidth: false,
+                    language:{
+                        processing: "<i class='fa fa-4x fa-spinner'></i>"
+                    },
+                    responsive: true,
+                    searching: true,
+                    //  to show the "workflow Status","Action" columns always in the last position
+                    columnDefs: [
+                        { responsivePriority: 1, targets: 0 },
+                        { responsivePriority: 2, targets: -1 },
+                    ],
+                    ajax:{
+                        "url": helpers.add_endpoint_json(api_endpoints.occurrence_report,vm.occurrence_report_obj.id+'/threats'),
+                        "dataSrc": ''
+                    },
+                    order: [],
+                    dom: "<'d-flex align-items-center'<'me-auto'l>fB>" +
+                     "<'row'<'col-sm-12'tr>>" +
+                     "<'d-flex align-items-center'<'me-auto'i>p>",
+                    buttons:[
+                        {
+                            extend: 'excel',
+                            text: '<i class="fa-solid fa-download"></i> Excel',
+                            className: 'btn btn-primary me-2 rounded',
+                            exportOptions: {
+                                orthogonal: 'export' 
+                            }
+                        },
+                        {
+                            extend: 'csv',
+                            text: '<i class="fa-solid fa-download"></i> CSV',
+                            className: 'btn btn-primary rounded',
+                            exportOptions: {
+                                orthogonal: 'export' 
+                            }
+                        },
+                    ],
+                    columns: [
+                        {
+                            data: "threat_number",
+                            orderable: true,
+                            searchable: true,
+                            mRender: function(data,type,full){
+                                if(full.visible){
+                                    return full.threat_number;
+                                }
+                                else{
+                                    return '<s>'+ full.threat_number + '</s>'
+                                }
+                            },
+
+                        },
+                        {
+                            data: "threat_category",
+                            orderable: true,
+                            searchable: true,
+                            mRender: function(data,type,full){
+                                if(full.visible){
+                                    return full.threat_category;
+                                }
+                                else{
+                                    return '<s>'+ full.threat_category + '</s>'
+                                }
+                            },
+
+                        },
+                        {
+                            data: "source",
+                            orderable: true,
+                            searchable: true,
+                            mRender: function(data,type,full){
+                                if(full.visible){
+                                    return full.source;
+                                }
+                                else{
+                                    return '<s>'+ full.source + '</s>'
+                                }
+                            },
+
+                        },
+                        {
+                            data: "date_observed",
+                            mRender:function (data,type,full){
+                                if(full.visible){
+                                    return data != '' && data != null ? moment(data).format('DD/MM/YYYY'):'';
+                                }
+                                else{
+                                    return data != '' && data != null ? '<s>'+ moment(data).format('DD/MM/YYYY'):'' + '</s>'
+                                }
+                            }
+                        },
+                        {
+                            data: "threat_agent",
+                            orderable: true,
+                            searchable: true,
+                            mRender: function(data,type,full){
+                                if(full.visible){
+                                    return full.threat_agent;
+                                }
+                                else{
+                                    return '<s>'+ full.threat_agent + '</s>'
+                                }
+                            },
+
+                        },
+                        {
+                            data: "comment",
+                            orderable: true,
+                            searchable: true,
+                            'render': function(value, type, full){
+                                let result = helpers.dtPopover(value, 30, 'hover');
+                                if(full.visible){
+                                    return type=='export' ? value : result;
+                                }
+                                else{
+                                    return type=='export' ? '<s>' + value + '</s>' : '<s>' + result + '</s>';
+                                }
+                            },
+                        },
+                        {
+                            data: "current_impact_name",
+                            orderable: true,
+                            searchable: true,
+                            mRender: function(data,type,full){
+                                if(full.visible){
+                                    return full.current_impact_name;
+                                }
+                                else{
+                                    return '<s>'+ full.current_impact_name + '</s>'
+                                }
+                            },
+
+                        },
+                        {
+                            data: "potential_impact_name",
+                            orderable: true,
+                            searchable: true,
+                            mRender: function(data,type,full){
+                                if(full.visible){
+                                    return full.potential_impact_name;
+                                }
+                                else{
+                                    return '<s>'+ full.potential_impact_name + '</s>'
+                                }
+                            },
+                        },
+                        {
+                            data: "id",
+                            mRender:function (data,type,full){
+                                let links = '';
+                                if(full.visible){
+                                    links +=  `<a href='#${full.id}' data-view-threat='${full.id}'>View</a><br/>`;
+                                    links +=  `<a href='#${full.id}' data-edit-threat='${full.id}'>Edit</a><br/>`;
+                                    links += `<a href='#' data-discard-threat='${full.id}'>Remove</a><br>`;
+                                }
+                                else{
+                                    links += `<a href='#' data-reinstate-threat='${full.id}'>Reinstate</a><br>`;
+                                }
+                                return links;
+                            }
+                        },
+                    ],
+                    processing:true,
+                    initComplete: function() {
+                        helpers.enablePopovers();
+                        // another option to fix the responsive table overflow css on tab switch
+                        // vm.$refs.threats_datatable.vmDataTable.draw('page');
+                        setTimeout(function (){
+                            vm.adjust_table_width();
+                        },100);
+                    }, 
+                }
+            }
+        },
+        components: {
+            FormSection,
+            datatable,
+            ThreatDetail,
+        },
+        computed: {
+            isReadOnly: function(){
+                // this prop (is_readonly = true) is only send from split/combine species form to make the original species readonly
+                if(this.is_readonly){
+                    return  this.is_readonly;
+                }
+            },
+        },
+        watch:{
+            
+        },
+        methods:{
+            newThreat: function(){
+                let vm=this;
+                this.$refs.threat_detail.threat_id = '';
+                //----for adding new species Threat
+                var new_ocr_threat={
+                    occurrence_report: vm.occurrence_report_obj.id,
+                    source:  vm.occurrence_report_obj.id,
+                    threat_category: '',
+                    threat_agent: '',
+                    comment: '',
+                    current_impact: '',
+                    potential_impact: '',
+                    potential_threat_onset: '',
+                    date_observed: null,
+                }
+                this.$refs.threat_detail.threatObj=new_ocr_threat;
+                this.$refs.threat_detail.threat_action='add';
+                this.$refs.threat_detail.isModalOpen = true;
+            },
+            editThreat: function(id){
+                let vm=this;
+                this.$refs.threat_detail.threat_id = id;
+                this.$refs.threat_detail.threat_action='edit';
+                Vue.http.get(helpers.add_endpoint_json(api_endpoints.ocr_threat,id)).then((response) => {
+                      this.$refs.threat_detail.threatObj=response.body; 
+                      this.$refs.threat_detail.threatObj.date_observed =  response.body.date_observed != null && response.body.date_observed != undefined ? moment(response.body.date_observed).format('yyyy-MM-DD'): '';
+                    },
+                  err => { 
+                            console.log(err);
+                      });
+                this.$refs.threat_detail.isModalOpen = true;
+            },
+            viewThreat: function(id){
+                let vm=this;
+                this.$refs.threat_detail.threat_id = id;
+                this.$refs.threat_detail.threat_action='view';
+                Vue.http.get(helpers.add_endpoint_json(api_endpoints.ocr_threat,id)).then((response) => {
+                      this.$refs.threat_detail.threatObj=response.body; 
+                      this.$refs.threat_detail.threatObj.date_observed =  response.body.date_observed != null && response.body.date_observed != undefined ? moment(response.body.date_observed).format('yyyy-MM-DD'): '';
+                    },
+                  err => { 
+                            console.log(err);
+                      });
+                this.$refs.threat_detail.isModalOpen = true;
+            },
+            discardThreat:function (id) {
+                let vm = this;
+                swal.fire({
+                    title: "Remove Threat",
+                    text: "Are you sure you want to remove this Threat?",
+                    icon: "warning",
+                    showCancelButton: true,
+                    confirmButtonText: 'Remove Threat',
+                    confirmButtonColor:'#d9534f'
+                }).then((result) => {
+                    if(result.isConfirmed){
+                        vm.$http.get(helpers.add_endpoint_json(api_endpoints.ocr_threat,id+'/discard'))
+                        .then((response) => {
+                            swal.fire({
+                                title: 'Discarded',
+                                text: 'Your threat has been removed',
+                                icon:'success',
+                                confirmButtonColor:'#226fbb'
+                            });
+                            vm.$refs.threats_datatable.vmDataTable.ajax.reload();
+                        }, (error) => {
+                            console.log(error);
+                        });
+                    }
+                },(error) => {
+
+                });
+            },
+            reinstateThreat:function (id) {
+                let vm = this;
+                swal.fire({
+                    title: "Reinstate Threat",
+                    text: "Are you sure you want to Reinstate this Threat?",
+                    icon: "question",
+                    showCancelButton: true,
+                    confirmButtonText: 'Reinstate Threat',
+                    confirmButtonColor:'#226fbb',
+                }).then((result) => {
+                    if(result.isConfirmed){
+                        vm.$http.get(helpers.add_endpoint_json(api_endpoints.ocr_threat,id+'/reinstate'))
+                        .then((response) => {
+                            swal.fire({
+                                title:'Reinstated',
+                                text:'Your threat has been reinstated',
+                                icon:'success',
+                                confirmButtonColor:'#226fbb',
+                            });
+                            vm.$refs.threats_datatable.vmDataTable.ajax.reload();
+                        }, (error) => {
+                            console.log(error);
+                        });
+                    }
+                },(error) => {
+
+                });
+            },
+            updatedThreats(){
+                this.$refs.threats_datatable.vmDataTable.ajax.reload();
+            },
+            addEventListeners:function (){
+                let vm=this;
+                vm.$refs.threats_datatable.vmDataTable.on('click', 'a[data-edit-threat]', function(e) {
+                    e.preventDefault();
+                    var id = $(this).attr('data-edit-threat');
+                    vm.editThreat(id);
+                });
+                vm.$refs.threats_datatable.vmDataTable.on('click', 'a[data-view-threat]', function(e) {
+                    e.preventDefault();
+                    var id = $(this).attr('data-view-threat');
+                    vm.viewThreat(id);
+                });
+                // External Discard listener
+                vm.$refs.threats_datatable.vmDataTable.on('click', 'a[data-discard-threat]', function(e) {
+                    e.preventDefault();
+                    var id = $(this).attr('data-discard-threat');
+                    vm.discardThreat(id);
+                });
+                // External Reinstate listener
+                vm.$refs.threats_datatable.vmDataTable.on('click', 'a[data-reinstate-threat]', function(e) {
+                    e.preventDefault();
+                    var id = $(this).attr('data-reinstate-threat');
+                    vm.reinstateThreat(id);
+                });
+            },
+            refreshFromResponse: function(){
+                this.$refs.threats_datatable.vmDataTable.ajax.reload();
+            },
+            adjust_table_width: function(){
+                this.$refs.threats_datatable.vmDataTable.columns.adjust().responsive.recalc();
+            },
+        },
+        mounted: function(){
+            let vm = this;
+            this.$nextTick(() => {
+                vm.addEventListeners();
+        });
+        }
+    }
+</script>
+
+<style lang="css" scoped>
+    /*ul, li {
+        zoom:1;
+        display: inline;
+    }*/
+    fieldset.scheduler-border {
+    border: 1px groove #ddd !important;
+    padding: 0 1.4em 1.4em 1.4em !important;
+    margin: 0 0 1.5em 0 !important;
+    -webkit-box-shadow:  0px 0px 0px 0px #000;
+            box-shadow:  0px 0px 0px 0px #000;
+    }
+    legend.scheduler-border {
+    width:inherit; /* Or auto */
+    padding:0 10px; /* To give a bit of padding on the left and right */
+    border-bottom:none;
+    }
+</style>
+
diff --git a/boranga/frontend/boranga/src/components/common/species_communities/add_threat.vue b/boranga/frontend/boranga/src/components/common/species_communities/add_threat.vue
index cd37b5e1..f97c06f1 100644
--- a/boranga/frontend/boranga/src/components/common/species_communities/add_threat.vue
+++ b/boranga/frontend/boranga/src/components/common/species_communities/add_threat.vue
@@ -99,13 +99,15 @@
                 </div>
             </div>
             <div slot="footer">
-                <template v-if="threat_id"> 
-                    <button type="button" v-if="updatingThreat" disabled class="btn btn-default" @click="ok"><i class="fa fa-spinnner fa-spin"></i> Updating</button>
-                    <button type="button" v-else class="btn btn-default" @click="ok">Update</button>
-                </template>
-                <template v-else>
-                    <button type="button" v-if="addingThreat" disabled class="btn btn-default" @click="ok"><i class="fa fa-spinner fa-spin"></i> Adding</button>
-                    <button type="button" v-else class="btn btn-default" @click="ok">Add</button>
+                <template v-if="threat_action!='view'">
+                    <template v-if="threat_id"> 
+                        <button type="button" v-if="updatingThreat" disabled class="btn btn-default" @click="ok"><i class="fa fa-spinnner fa-spin"></i> Updating</button>
+                        <button type="button" v-else class="btn btn-default" @click="ok">Update</button>
+                    </template>
+                    <template v-else>
+                        <button type="button" v-if="addingThreat" disabled class="btn btn-default" @click="ok"><i class="fa fa-spinner fa-spin"></i> Adding</button>
+                        <button type="button" v-else class="btn btn-default" @click="ok">Add</button>
+                    </template>
                 </template>
                 <button type="button" class="btn btn-default" @click="cancel">Cancel</button>
             </div>
@@ -197,6 +199,7 @@ export default {
         sendData:function(){
             let vm = this;
             vm.errors = false;
+            vm.threatObj.date_observed = vm.threatObj.date_observed == ""? null: vm.threatObj.date_observed
             let threatObj = JSON.parse(JSON.stringify(vm.threatObj));
             let formData = new FormData()
 
diff --git a/boranga/frontend/boranga/src/components/form_occurrence_report.vue b/boranga/frontend/boranga/src/components/form_occurrence_report.vue
index aa46c2ad..82185978 100644
--- a/boranga/frontend/boranga/src/components/form_occurrence_report.vue
+++ b/boranga/frontend/boranga/src/components/form_occurrence_report.vue
@@ -55,6 +55,19 @@
                   Documents
                 </a>
               </li>
+              <li class="nav-item">
+                <a 
+                    class="nav-link" 
+                    id="pills-threats-tab" 
+                    data-bs-toggle="pill" 
+                    :href="'#' + threatBody" 
+                    role="tab" 
+                    :aria-selected="threatBody" 
+                    aria-selected="false"
+                    @click="tabClicked()">
+                  Threats
+                </a>
+              </li>
               <!-- <li class="nav-item">
                 <a 
                   class="nav-link" 
@@ -107,9 +120,19 @@
                     ref="ocr_documents" 
                     id="ocrDocuments" 
                     :is_internal="is_internal"
+                    :is_external="is_external"
                     :occurrence_report_obj="occurrence_report_obj">
                 </OCRDocuments>
               </div>
+              <div class="tab-pane fade" :id="threatBody" role="tabpanel" aria-labelledby="pills-threats-tab">
+                <OCRThreats
+                    :key="reloadcount"
+                    ref="ocr_threats" 
+                    id="ocrThreats" 
+                    :is_internal="is_internal"
+                    :occurrence_report_obj="occurrence_report_obj">
+                </OCRThreats>
+              </div>
               <!-- <div class="tab-pane fade" :id="relatedItemBody" role="tabpanel" aria-labelledby="pills-related-items-tab">
                 <RelatedItems
                     :key="reloadcount" 
@@ -132,6 +155,7 @@
     // import OCRHabitat from '@/components/common/conservation_status/cs_documents.vue'
     // import RelatedItems from '@/components/common/table_related_items.vue'
     import OCRDocuments from '@/components/common/occurrence/ocr_documents.vue'
+    import OCRThreats from '@/components/common/occurrence/ocr_threats.vue'
     
     export default {
         props:{
@@ -165,7 +189,7 @@
                 locationBody: 'locationBody' + vm._uid,
                 habitatBody: 'habitatBody' + vm._uid,
                 observationBody: 'observationBody' + vm._uid,
-                threatsBody: 'threatsBody' + vm._uid,
+                threatBody: 'threatBody' + vm._uid,
                 documentBody: 'documentBody' + vm._uid,
                 relatedItemBody: 'relatedItemBody' + vm._uid,
             }
@@ -175,14 +199,12 @@
             OCRHabitat,
             OCRObservation,
             OCRDocuments,
+            OCRThreats,
             // CommunityStatus,
             // CSDocuments,
             // RelatedItems,
         },
         computed:{
-            isCommunity: function(){
-                return this.occurrence_report_obj.group_type == "community"
-            },
             related_items_ajax_url: function(){
               return '/api/conservation_status/' + this.occurrence_report_obj.id + '/get_related_items/'
             },
diff --git a/boranga/migrations/0190_ocrconservationthreat.py b/boranga/migrations/0190_ocrconservationthreat.py
new file mode 100644
index 00000000..76927411
--- /dev/null
+++ b/boranga/migrations/0190_ocrconservationthreat.py
@@ -0,0 +1,30 @@
+# Generated by Django 3.2.23 on 2024-02-06 03:11
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boranga', '0189_rename_added_by_occurrencereportdocument_uploaded_by'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='OCRConservationThreat',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('threat_number', models.CharField(blank=True, default='', max_length=9)),
+                ('comment', models.CharField(default='None', max_length=512)),
+                ('date_observed', models.DateField(blank=True, null=True)),
+                ('visible', models.BooleanField(default=True)),
+                ('current_impact', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='boranga.currentimpact')),
+                ('occurrence_report', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='ocr_threats', to='boranga.occurrencereport')),
+                ('potential_impact', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='boranga.potentialimpact')),
+                ('potential_threat_onset', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='boranga.potentialthreatonset')),
+                ('threat_agent', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, to='boranga.threatagent')),
+                ('threat_category', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to='boranga.threatcategory')),
+            ],
+        ),
+    ]
diff --git a/boranga/templates/webtemplate_dbca/includes/primary_menu.html b/boranga/templates/webtemplate_dbca/includes/primary_menu.html
index 0f52c5c2..2995e0b7 100644
--- a/boranga/templates/webtemplate_dbca/includes/primary_menu.html
+++ b/boranga/templates/webtemplate_dbca/includes/primary_menu.html
@@ -16,6 +16,6 @@
 
 {% else %}
     <li class="nav-item"><a class="nav-link" href="/external/conservation-status">Conservation Status</a></li>
-    {% comment %} <li class="nav-item"><a class="nav-link" href="/external/occurrence-report">Occurrences</a></li> {% endcomment %}
+    <li class="nav-item"><a class="nav-link" href="/external/occurrence-report">Occurrence Reports</a></li>
 {% endif %}
 
diff --git a/boranga/urls.py b/boranga/urls.py
index ca293519..5f327e59 100755
--- a/boranga/urls.py
+++ b/boranga/urls.py
@@ -67,6 +67,7 @@
 router.register(r'occurrence_report_paginated',occurrence_api.OccurrenceReportPaginatedViewSet)
 router.register(r'observer_detail',occurrence_api.ObserverDetailViewSet)
 router.register(r'occurrence_report_documents',occurrence_api.OccurrenceReportDocumentViewSet)
+router.register(r'ocr_threat',occurrence_api.OCRConservationThreatViewSet)
 
 router.register(r'proposal_submit',proposal_api.ProposalSubmitViewSet)
 router.register(r'proposal_paginated',proposal_api.ProposalPaginatedViewSet)
diff --git a/dockerdev/Dockerfile b/dockerdev/Dockerfile
index 48f6684b..c07a6000 100644
--- a/dockerdev/Dockerfile
+++ b/dockerdev/Dockerfile
@@ -8,6 +8,7 @@ RUN apt-get install --no-install-recommends -y screen
 RUN apt-get install --no-install-recommends -y virtualenv
 RUN apt-get install --no-install-recommends -y graphviz
 RUN apt-get install --no-install-recommends -y python3-pydot
+RUN apt-get install --no-install-recommends -y graphviz libgraphviz-dev pkg-config
 
 RUN openssl req -new -newkey rsa:4096 -days 3650 -nodes -x509 -subj  "/C=AU/ST=Western Australia/L=Perth/O=Development Environment/OU=IT Department/CN=example.com"  -keyout /etc/ssl/private/selfsignedssl.key -out /etc/ssl/private/selfsignedssl.crt
 
diff --git a/requirements.txt b/requirements.txt
index d32cd38a..3fc6b388 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -67,3 +67,4 @@ python-decouple==3.8
 numpy==1.26.3
 setuptools==69.0.3
 wheel==0.42.0
+pygraphviz==1.12