diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CmmcBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CmmcBusiness.cs
index 53233ef7de..9beed8339c 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CmmcBusiness.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/CmmcBusiness.cs
@@ -1,4 +1,4 @@
-//////////////////////////////// 
+//////////////////////////////// 
 // 
 //   Copyright 2024 Battelle Energy Alliance, LLC  
 // 
@@ -88,7 +88,7 @@ public CmmcScores GetCmmcScores(int assessmentId)
             // Level 3
             response.Level3Score = GetScoreForLevel(assessmentId, 3);
             response.Level3MaxScore = _level3Max;
-            response.Level3Active = (response.Level2Score == _level2Max);
+            response.Level3Active = response.Level2Active && (response.Level2Score == _level2Max);
 
 
             return response;
@@ -208,7 +208,7 @@ private CmmcScoreModel FilterByLevel(XDocument x, int level)
 
 
         /// <summary>
-        /// Calculates a SPRS score based on the question scoring values in MATURITY_EXTRA.
+        /// Calculates a SPRS score based on the level 2 question scoring values in MATURITY_EXTRA.
         /// </summary>
         public CmmcScoreModel GetSPRSScore(int assessmentId)
         {
@@ -227,7 +227,7 @@ public CmmcScoreModel GetSPRSScore(int assessmentId)
                 d.DomainName = goal.Attribute("title").Value;
                 response.Domains.Add(d);
 
-                foreach (var question in goal.Descendants("Question"))
+                foreach (var question in goal.Descendants("Question").Where(x => x.Attribute("level").Value == "2"))
                 {
                     var q = new CmmcQuestion();
                     q.QuestionId = int.Parse(question.Attribute("questionid").Value);
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/MaturityBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/MaturityBusiness.cs
index c9a82f1481..4a9749bff5 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/MaturityBusiness.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Maturity/MaturityBusiness.cs
@@ -825,6 +825,7 @@ public MaturityResponse GetMaturityQuestions(int assessmentId, bool fill, int gr
             var questionQuery = _context.MATURITY_QUESTIONS
                 .Include(x => x.Maturity_Level)
                 .Include(x => x.MATURITY_QUESTION_PROPS)
+                .Include(x => x.MATURITY_EXTRA)
                 .Where(q =>
                 targetModelId == q.Maturity_Model_Id);
 
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/ANALYTICS_MATURITY_GROUPINGS.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/ANALYTICS_MATURITY_GROUPINGS.cs
index b04422ff2a..15348184d6 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/ANALYTICS_MATURITY_GROUPINGS.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/ANALYTICS_MATURITY_GROUPINGS.cs
@@ -21,6 +21,12 @@ public partial class ANALYTICS_MATURITY_GROUPINGS
     [StringLength(200)]
     public string Question_Group { get; set; }
 
+    public int? Group_Sequence { get; set; }
+
+    public int? Global_Sequence { get; set; }
+
+    public int? Group_id { get; set; }
+
     [ForeignKey("Maturity_Model_Id")]
     [InverseProperty("ANALYTICS_MATURITY_GROUPINGS")]
     public virtual MATURITY_MODELS Maturity_Model { get; set; }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/Analytics_Answers.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/Analytics_Answers.cs
index 7c4c82491e..19d256f87a 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/Analytics_Answers.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/Analytics_Answers.cs
@@ -19,6 +19,7 @@ public partial class Analytics_Answers
     [StringLength(20)]
     public string Question_Type { get; set; }
 
+    [Required]
     [StringLength(1)]
     public string Answer_Text { get; set; }
 }
\ No newline at end of file
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/Answer_Components_Default.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/Answer_Components_Default.cs
index a01412e7e7..baae5e7c5d 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/Answer_Components_Default.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/Answer_Components_Default.cs
@@ -40,7 +40,7 @@ public partial class Answer_Components_Default
     public int GroupHeadingId { get; set; }
 
     [Required]
-    [StringLength(150)]
+    [StringLength(100)]
     public string Universal_Sub_Category { get; set; }
 
     public int SubCategoryId { get; set; }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/Answer_Components_Exploded.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/Answer_Components_Exploded.cs
index 00c9083314..ed5bff4079 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/Answer_Components_Exploded.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/Answer_Components_Exploded.cs
@@ -48,7 +48,7 @@ public partial class Answer_Components_Exploded
 
     public int? GroupHeadingId { get; set; }
 
-    [StringLength(150)]
+    [StringLength(100)]
     public string Universal_Sub_Category { get; set; }
 
     public int? SubCategoryId { get; set; }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/Answer_Components_Overrides.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/Answer_Components_Overrides.cs
index 8961c95bb0..a9c960e810 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/Answer_Components_Overrides.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/Answer_Components_Overrides.cs
@@ -45,7 +45,7 @@ public partial class Answer_Components_Overrides
 
     public int? GroupHeadingId { get; set; }
 
-    [StringLength(150)]
+    [StringLength(100)]
     public string Universal_Sub_Category { get; set; }
 
     public int? SubCategoryId { get; set; }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/CsetwebContext.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/CsetwebContext.cs
index 1fee6a7a79..1d24391705 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/CsetwebContext.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/CsetwebContext.cs
@@ -569,10 +569,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .HasComment("The Answer Text is used to");
             entity.Property(e => e.Comment).HasComment("The Comment is used to");
             entity.Property(e => e.Component_Guid).HasComment("The Component Guid is used to");
-            entity.Property(e => e.Is_Component).HasComputedColumnSql("(CONVERT([bit],case [Question_Type] when 'Component' then (1) else (0) end,(0)))", false);
-            entity.Property(e => e.Is_Framework).HasComputedColumnSql("(CONVERT([bit],case [Question_Type] when 'Framework' then (1) else (0) end,(0)))", false);
-            entity.Property(e => e.Is_Maturity).HasComputedColumnSql("(CONVERT([bit],case [Question_Type] when 'Maturity' then (1) else (0) end,(0)))", false);
-            entity.Property(e => e.Is_Requirement).HasComputedColumnSql("(CONVERT([bit],case [Question_Type] when 'Requirement' then (1) else (0) end,(0)))", false);
+            entity.Property(e => e.Is_Component).HasComputedColumnSql("(CONVERT([bit],case [Question_Type] when 'Component' then (1) else (0) end))", false);
+            entity.Property(e => e.Is_Framework).HasComputedColumnSql("(CONVERT([bit],case [Question_Type] when 'Framework' then (1) else (0) end))", false);
+            entity.Property(e => e.Is_Maturity).HasComputedColumnSql("(CONVERT([bit],case [Question_Type] when 'Maturity' then (1) else (0) end))", false);
+            entity.Property(e => e.Is_Requirement).HasComputedColumnSql("(CONVERT([bit],case [Question_Type] when 'Requirement' then (1) else (0) end))", false);
             entity.Property(e => e.Mark_For_Review).HasComment("The Mark For Review is used to");
             entity.Property(e => e.Question_Number).HasComment("The Question Number is used to");
             entity.Property(e => e.Question_Or_Requirement_Id).HasComment("The Question Or Requirement Id is used to");
@@ -1800,6 +1800,10 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         modelBuilder.Entity<MATURITY_EXTRA>(entity =>
         {
             entity.Property(e => e.Maturity_Question_Id).ValueGeneratedNever();
+
+            entity.HasOne(d => d.Maturity_Question).WithOne(p => p.MATURITY_EXTRA)
+                .OnDelete(DeleteBehavior.ClientSetNull)
+                .HasConstraintName("fk_mat_questions");
         });
 
         modelBuilder.Entity<MATURITY_GROUPINGS>(entity =>
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/CsetwebContextProcedures.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/CsetwebContextProcedures.cs
index ce88038136..40ad6416b3 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/CsetwebContextProcedures.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/CsetwebContextProcedures.cs
@@ -1,4 +1,4 @@
-// <auto-generated> This file has been auto generated by EF Core Power Tools. </auto-generated>
+// <auto-generated> This file has been auto generated by EF Core Power Tools. </auto-generated>
 #nullable disable
 using CSETWebCore.DataLayer.Model;
 using Microsoft.Data.SqlClient;
@@ -1915,6 +1915,31 @@ public virtual async Task<List<usp_financial_attributesResult>> usp_financial_at
             return _;
         }
 
+        public virtual async Task<List<usp_GenerateSPRSScoreResult>> usp_GenerateSPRSScoreAsync(int? assessment_id, OutputParameter<int> returnValue = null, CancellationToken cancellationToken = default)
+        {
+            var parameterreturnValue = new SqlParameter
+            {
+                ParameterName = "returnValue",
+                Direction = System.Data.ParameterDirection.Output,
+                SqlDbType = System.Data.SqlDbType.Int,
+            };
+
+            var sqlParameters = new []
+            {
+                new SqlParameter
+                {
+                    ParameterName = "assessment_id",
+                    Value = assessment_id ?? Convert.DBNull,
+                    SqlDbType = System.Data.SqlDbType.Int,
+                },
+                parameterreturnValue,
+            };
+            var _ = await _context.SqlQueryAsync<usp_GenerateSPRSScoreResult>("EXEC @returnValue = [dbo].[usp_GenerateSPRSScore] @assessment_id = @assessment_id", sqlParameters, cancellationToken);
+
+            returnValue?.SetValue(parameterreturnValue.Value);
+
+            return _;
+        }
 
         public virtual async Task<List<usp_getAnswerComponentOverridesResult>> usp_getAnswerComponentOverridesAsync(int? assessment_id, OutputParameter<int> returnValue = null, CancellationToken cancellationToken = default)
         {
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/ICsetwebContextProcedures.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/ICsetwebContextProcedures.cs
index 33c97711e0..379df300e8 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/ICsetwebContextProcedures.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/ICsetwebContextProcedures.cs
@@ -73,6 +73,7 @@ public partial interface ICsetwebContextProcedures
         Task<int> usp_CopyIntoSet_DeleteAsync(string DestinationSetName, OutputParameter<int> returnValue = null, CancellationToken cancellationToken = default);
         Task<List<usp_countsForLevelsByGroupMaturityModelResult>> usp_countsForLevelsByGroupMaturityModelAsync(int? assessment_id, int? mat_model_id, OutputParameter<int> returnValue = null, CancellationToken cancellationToken = default);
         Task<List<usp_financial_attributesResult>> usp_financial_attributesAsync(int? Assessment_Id, OutputParameter<int> returnValue = null, CancellationToken cancellationToken = default);
+        Task<List<usp_GenerateSPRSScoreResult>> usp_GenerateSPRSScoreAsync(int? assessment_id, OutputParameter<int> returnValue = null, CancellationToken cancellationToken = default);
         Task<List<usp_getAnswerComponentOverridesResult>> usp_getAnswerComponentOverridesAsync(int? assessment_id, OutputParameter<int> returnValue = null, CancellationToken cancellationToken = default);
         Task<List<usp_GetAssessmentPieResult>> usp_GetAssessmentPieAsync(int? Assessment_Id, OutputParameter<int> returnValue = null, CancellationToken cancellationToken = default);
         Task<List<usp_getComponentsRankedCategoriesResult>> usp_getComponentsRankedCategoriesAsync(int? assessment_id, OutputParameter<int> returnValue = null, CancellationToken cancellationToken = default);
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/MATURITY_EXTRA.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/MATURITY_EXTRA.cs
index 5013c0ffcd..36b356612a 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/MATURITY_EXTRA.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/MATURITY_EXTRA.cs
@@ -30,4 +30,11 @@ public partial class MATURITY_EXTRA
 
     [StringLength(100)]
     public string CMMC2_Title { get; set; }
+
+    [StringLength(50)]
+    public string Answer_Options { get; set; }
+
+    [ForeignKey("Maturity_Question_Id")]
+    [InverseProperty("MATURITY_EXTRA")]
+    public virtual MATURITY_QUESTIONS Maturity_Question { get; set; }
 }
\ No newline at end of file
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/MATURITY_QUESTIONS.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/MATURITY_QUESTIONS.cs
index f2a886d5a8..6711878cd1 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/MATURITY_QUESTIONS.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/MATURITY_QUESTIONS.cs
@@ -89,6 +89,9 @@ public partial class MATURITY_QUESTIONS
     [InverseProperty("Mat_Question")]
     public virtual ICollection<MATURITY_ANSWER_OPTIONS> MATURITY_ANSWER_OPTIONS { get; set; } = new List<MATURITY_ANSWER_OPTIONS>();
 
+    [InverseProperty("Maturity_Question")]
+    public virtual MATURITY_EXTRA MATURITY_EXTRA { get; set; }
+
     [InverseProperty("Mat_Question")]
     public virtual ICollection<MATURITY_QUESTION_PROPS> MATURITY_QUESTION_PROPS { get; set; } = new List<MATURITY_QUESTION_PROPS>();
 
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/Nlogs.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/Nlogs.cs
index 7c015298dd..1b9eef3d9a 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/Nlogs.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/Nlogs.cs
@@ -25,4 +25,7 @@ public partial class Nlogs
 
     [StringLength(4000)]
     public string Message { get; set; }
+
+    [StringLength(100)]
+    public string User { get; set; }
 }
\ No newline at end of file
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/usp_GenerateSPRSScoreResult.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/usp_GenerateSPRSScoreResult.cs
new file mode 100644
index 0000000000..e35ed4fb3c
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/usp_GenerateSPRSScoreResult.cs
@@ -0,0 +1,12 @@
+// <auto-generated> This file has been auto generated by EF Core Power Tools. </auto-generated>
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace CSETWebCore.DataLayer.Model
+{
+    public partial class usp_GenerateSPRSScoreResult
+    {
+        public int? SPRS_SCORE { get; set; }
+    }
+}
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/usp_GetQuestionsResult.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/usp_GetQuestionsResult.cs
new file mode 100644
index 0000000000..4597eefeb4
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/usp_GetQuestionsResult.cs
@@ -0,0 +1,11 @@
+// <auto-generated> This file has been auto generated by EF Core Power Tools. </auto-generated>
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace CSETWebCore.DataLayer.Model
+{
+    public partial class usp_GetQuestionsResult
+    {
+    }
+}
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/vQUESTION_HEADINGS.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/vQUESTION_HEADINGS.cs
index 280fff258b..b9b0784aaa 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/vQUESTION_HEADINGS.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.DataLayer/Model/vQUESTION_HEADINGS.cs
@@ -20,7 +20,7 @@ public partial class vQUESTION_HEADINGS
     public int Question_Group_Heading_Id { get; set; }
 
     [Required]
-    [StringLength(150)]
+    [StringLength(100)]
     public string Universal_Sub_Category { get; set; }
 
     [StringLength(1000)]
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/QuestionAnswerBuilder.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/QuestionAnswerBuilder.cs
index 38aff30e2c..c2ac3f3ec6 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/QuestionAnswerBuilder.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Helpers/QuestionAnswerBuilder.cs
@@ -1,10 +1,6 @@
 using CSETWebCore.DataLayer.Model;
 using CSETWebCore.Model.Question;
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace CSETWebCore.Helpers
 {
@@ -49,6 +45,11 @@ public static QuestionAnswer BuildQuestionAnswer(MATURITY_QUESTIONS myQ, FullAns
                 SetName = string.Empty
             };
 
+            if (myQ.MATURITY_EXTRA?.Answer_Options != null)
+            {
+                qa.AnswerOptions = myQ.MATURITY_EXTRA?.Answer_Options.Split(',').ToList();
+            }
+
             return qa;
         }
 
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionAnswer.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionAnswer.cs
index 63cc680426..741877a897 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionAnswer.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Question/QuestionAnswer.cs
@@ -35,6 +35,13 @@ public class QuestionAnswer
         public List<ParameterToken> ParmSubs { get; set; }
         public string StdRefId { get; set; }
         public string Answer { get; set; }
+
+        /// <summary>
+        /// If a question's potential answer set deviates from the one 
+        /// defined at the MaturityModel level.  
+        /// </summary>
+        public List<string> AnswerOptions { get; set; }
+
         public string AltAnswerText { get; set; }
         public string FreeResponseAnswer { get; set; }
         public string Comment { get; set; }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MaturityController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MaturityController.cs
index ef3d7a14e0..6ff5240325 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MaturityController.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MaturityController.cs
@@ -171,6 +171,11 @@ public IActionResult GetTargetLevel()
         }
 
 
+        /// <summary>
+        /// TODO: Cannot find this endpoint name in the UI codebase
+        /// </summary>
+        /// <param name="mat_model_id"></param>
+        /// <returns></returns>
         [HttpGet]
         [Route("api/MaturityModel/GetLevelScoresByGroup")]
         public IActionResult GetLevelScoresByGroup(int mat_model_id)
diff --git a/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions-acet.component.ts b/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions-acet.component.ts
index 47ee54bf6a..ec6321786d 100644
--- a/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions-acet.component.ts
+++ b/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions-acet.component.ts
@@ -121,7 +121,7 @@ export class MaturityQuestionsAcetComponent implements OnInit, AfterViewInit {
         this.groupings = response.groupings;
         this.assessSvc.assessment.maturityModel.maturityTargetLevel = response.maturityTargetLevel;
         this.assessSvc.assessment.maturityModel.answerOptions = response.answerOptions;
-        this.filterSvc.answerOptions = response.answerOptions;
+        this.filterSvc.answerOptions = response.answerOptions.slice();
         this.filterSvc.maturityModelId = response.modelId;
         this.filterSvc.maturityModelName = response.modelName;
 
diff --git a/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions-cie/maturity-questions-cie.component.ts b/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions-cie/maturity-questions-cie.component.ts
index c542ecf832..d52c71f7fa 100644
--- a/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions-cie/maturity-questions-cie.component.ts
+++ b/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions-cie/maturity-questions-cie.component.ts
@@ -182,7 +182,7 @@ export class MaturityQuestionsCieComponent implements OnInit, AfterViewInit {
         }
         this.assessSvc.assessment.maturityModel.maturityTargetLevel = response.maturityTargetLevel;
         this.assessSvc.assessment.maturityModel.answerOptions = response.answerOptions;
-        this.filterSvc.answerOptions = response.answerOptions;
+        this.filterSvc.answerOptions = response.answerOptions.slice();
         this.filterSvc.maturityModelId = response.modelId;
 
        
diff --git a/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions-ise.component.ts b/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions-ise.component.ts
index 11921fb3cd..74d6ef52cc 100644
--- a/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions-ise.component.ts
+++ b/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions-ise.component.ts
@@ -126,7 +126,7 @@ export class MaturityQuestionsIseComponent implements OnInit, AfterViewInit {
 
         this.assessSvc.assessment.maturityModel.maturityTargetLevel = response.maturityTargetLevel;
         this.assessSvc.assessment.maturityModel.answerOptions = response.answerOptions;
-        this.filterSvc.answerOptions = response.answerOptions;
+        this.filterSvc.answerOptions = response.answerOptions.slice();
         this.filterSvc.maturityModelId = response.modelId;
 
         // get the selected maturity filters
diff --git a/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions.component.ts b/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions.component.ts
index 10f90fd82d..a17294d11d 100644
--- a/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions.component.ts
+++ b/CSETWebNg/src/app/assessment/questions/maturity-questions/maturity-questions.component.ts
@@ -197,7 +197,7 @@ export class MaturityQuestionsComponent implements OnInit, AfterViewInit {
         this.assessSvc.assessment.maturityModel.maturityTargetLevel = response.maturityTargetLevel;
 
         this.assessSvc.assessment.maturityModel.answerOptions = response.answerOptions;
-        this.filterSvc.answerOptions = response.answerOptions;
+        this.filterSvc.answerOptions = response.answerOptions.slice();
         this.filterSvc.maturityModelId = response.modelId;
         this.filterSvc.maturityModelName = response.modelName;
 
@@ -247,7 +247,7 @@ export class MaturityQuestionsComponent implements OnInit, AfterViewInit {
       this.assessSvc.assessment.maturityModel.maturityTargetLevel = response.maturityTargetLevel;
 
       this.assessSvc.assessment.maturityModel.answerOptions = response.answerOptions;
-      this.filterSvc.answerOptions = response.answerOptions;
+      this.filterSvc.answerOptions = response.answerOptions.slice();
       this.filterSvc.maturityModelId = response.modelId;
 
       this.pageTitle = this.questionsAlias + ' - ' + this.modelName;
diff --git a/CSETWebNg/src/app/assessment/questions/question-block-ise/question-block-ise.component.html b/CSETWebNg/src/app/assessment/questions/question-block-ise/question-block-ise.component.html
index 7373c93c0b..ca2db4f6d6 100644
--- a/CSETWebNg/src/app/assessment/questions/question-block-ise/question-block-ise.component.html
+++ b/CSETWebNg/src/app/assessment/questions/question-block-ise/question-block-ise.component.html
@@ -142,7 +142,7 @@
                                 <label class="me-0 ms-2 btn form-check-label btn-mfr"
                                     [class.answer-selected]="q.markForReview === true"
                                     matTooltip="This control requires further review.">
-                                    <input name="q_{{ q.questionId }}_F" type="checkbox"
+                                    <input name="q_{{ q.questionId }}_F" type="checkbox" class="btn-check"
                                         (keydown)="checkKeyPress($event, q, 'mfr')" (click)="saveMFR(q);" tabindex="0"
                                         [checked]="q.markForReview === true">
                                     <span class="cset-icons-flag-dark fs-base"></span>
diff --git a/CSETWebNg/src/app/assessment/questions/question-block-maturity/question-block-maturity.component.html b/CSETWebNg/src/app/assessment/questions/question-block-maturity/question-block-maturity.component.html
index 0f45e0ef36..78567b3439 100644
--- a/CSETWebNg/src/app/assessment/questions/question-block-maturity/question-block-maturity.component.html
+++ b/CSETWebNg/src/app/assessment/questions/question-block-maturity/question-block-maturity.component.html
@@ -98,7 +98,7 @@
                 <div *ngIf="!q.isParentQuestion">
                     <!-- build the list of answer choice buttons -->
                     <div class="btn-group btn-group-toggle answer-group" data-toggle="buttons">
-                        <label *ngFor="let option of answerOptions"
+                        <label *ngFor="let option of q.answerOptions ?? modelAnswerOptions"
                             class="btn form-check-label d-flex align-items-center" tabindex="0"
                             [class]="questionsSvc.answerOptionCss(maturityModelName, option)"
                             [class.answer-selected]="q.answer === option"
@@ -178,8 +178,8 @@
                         <label class="me-0 ms-2 btn form-check-label btn-mfr"
                             [class.answer-selected]="q.markForReview === true"
                             matTooltip="This control requires further review.">
-                            <input name="q_{{q.questionId}}_F" type="checkbox" (click)="saveMFR(q);" tabindex="0"
-                                checked="{{q.markForReview === true}}">
+                            <input name="q_{{q.questionId}}_F" type="checkbox" (click)="saveMFR(q);" class="btn-check"
+                                tabindex="0" checked="{{q.markForReview === true}}">
                             <span class="cset-icons-flag-dark fs-base"></span>
                         </label>
                     </div>
diff --git a/CSETWebNg/src/app/assessment/questions/question-block-maturity/question-block-maturity.component.ts b/CSETWebNg/src/app/assessment/questions/question-block-maturity/question-block-maturity.component.ts
index dbd7969592..69e5544116 100644
--- a/CSETWebNg/src/app/assessment/questions/question-block-maturity/question-block-maturity.component.ts
+++ b/CSETWebNg/src/app/assessment/questions/question-block-maturity/question-block-maturity.component.ts
@@ -55,7 +55,7 @@ export class QuestionBlockMaturityComponent implements OnInit {
   private _timeoutId: NodeJS.Timeout;
 
   percentAnswered = 0;
-  answerOptions = [];
+  modelAnswerOptions = [];
 
   // tokenized placeholder for transloco, made this variable a switch between the different placeholders
   altTextPlaceholder = "alt cset";
@@ -88,7 +88,7 @@ export class QuestionBlockMaturityComponent implements OnInit {
    */
   ngOnInit(): void {
     if (this.assessSvc.assessment.maturityModel.modelName != null) {
-      this.answerOptions = this.assessSvc.assessment.maturityModel.answerOptions;
+      this.modelAnswerOptions = this.assessSvc.assessment.maturityModel.answerOptions;
       this.maturityModelId = this.assessSvc.assessment.maturityModel.modelId;
       this.maturityModelName = this.assessSvc.assessment.maturityModel.modelName;
     }
@@ -238,12 +238,10 @@ export class QuestionBlockMaturityComponent implements OnInit {
         return;
       }
       if (q.visible) {
-
         totalCount++;
         if (q.answer && q.answer !== "U") {
           answeredCount++;
         }
-
       }
     });
     this.percentAnswered = (answeredCount / totalCount) * 100;
@@ -300,7 +298,6 @@ export class QuestionBlockMaturityComponent implements OnInit {
         this.storeAnswer(q, newAnswerValue);
       }
     }
-
   }
 
   checkReviewKeyPress(event: any, q: Question) {
@@ -310,6 +307,4 @@ export class QuestionBlockMaturityComponent implements OnInit {
       }
     }
   }
-
-
 }
diff --git a/CSETWebNg/src/app/assessment/questions/question-block-vadr/question-block-vadr.component.html b/CSETWebNg/src/app/assessment/questions/question-block-vadr/question-block-vadr.component.html
index 23311188a2..93092e6ec3 100644
--- a/CSETWebNg/src/app/assessment/questions/question-block-vadr/question-block-vadr.component.html
+++ b/CSETWebNg/src/app/assessment/questions/question-block-vadr/question-block-vadr.component.html
@@ -121,7 +121,7 @@
 
 
                                 <!-- Mark For Review Flag  -->
-                                <label class="me-0 ms-2 btn btm-check btn-mfr"
+                                <label class="me-0 ms-2 btn form-check-label btn-mfr"
                                     [class.answer-selected]="q.markForReview === true"
                                     matTooltip="This control requires further review.">
                                     <input name="q_{{q.questionId}}_F" type="checkbox" class="btn-check" (click)="saveMFR(q);"
@@ -202,7 +202,7 @@
 
 
                                 <!-- Mark For Review Flag  -->
-                                <label class="me-0 ms-2 btn btn-mfr"
+                                <label class="me-0 ms-2 btn btn-mfr form-check-label"
                                     [class.answer-selected]="q.markForReview === true"
                                     matTooltip="This control requires further review.">
                                     <input name="q_{{q.questionId}}_F" type="checkbox" class="btn-check" (click)="saveMFR(q);"
diff --git a/CSETWebNg/src/app/assessment/questions/question-block/question-block.component.html b/CSETWebNg/src/app/assessment/questions/question-block/question-block.component.html
index bad04a8fca..2dac629ec4 100644
--- a/CSETWebNg/src/app/assessment/questions/question-block/question-block.component.html
+++ b/CSETWebNg/src/app/assessment/questions/question-block/question-block.component.html
@@ -116,7 +116,7 @@
               </label>
 
               <!-- Mark For Review Flag  -->
-              <label class="me-0 ms-2 btn btn-mfr" [class.answer-selected]="q.markForReview === true"
+              <label class="me-0 ms-2 btn btn-mfr form-check-label" [class.answer-selected]="q.markForReview === true"
                 [matTooltip]="('tooltip.mfr-flag' | transloco)">
                 <input name="q_{{q.questionId}}_F" type="checkbox" class="btn-check" (click)="saveMFR(q);" tabindex="0"
                   checked="{{q.markForReview === true}}">
@@ -171,9 +171,9 @@
               </label>
 
               <!-- Mark For Review Flag  -->
-              <label class="me-0 ms-2 btn form-check-label btn-mfr align-items-center"
+              <label class="me-0 ms-2 btn btn-mfr form-check-label align-items-center"
                 [class.answer-selected]="q.markForReview === true" [matTooltip]="('tooltip.mfr-flag' | transloco)">
-                <input name="q_{{q.questionId}}_F" type="checkbox" (click)="saveMFR(q);" tabindex="0"
+                <input name="q_{{q.questionId}}_F" type="checkbox" class="btn-check" (click)="saveMFR(q);" tabindex="0"
                   checked="{{q.markForReview === true}}">
                 <span class="cset-icons-flag-dark fs-base"></span>
               </label>
diff --git a/CSETWebNg/src/app/assessment/questions/question-extras/question-extras.component.html b/CSETWebNg/src/app/assessment/questions/question-extras/question-extras.component.html
index b34cbe2300..0ba79cc477 100644
--- a/CSETWebNg/src/app/assessment/questions/question-extras/question-extras.component.html
+++ b/CSETWebNg/src/app/assessment/questions/question-extras/question-extras.component.html
@@ -149,7 +149,7 @@
             <label *ngIf="showMfr" class="me-0 ms-2 btn form-check-label btn-mfr"
                 [class.answer-selected]="myQuestion.markForReview === true"
                 matTooltip="This control requires further review.">
-                <input name="q_{{myQuestion.questionId}}_F" type="checkbox"
+                <input name="q_{{myQuestion.questionId}}_F" type="checkbox" class="btn-check"
                     (click)="this.questionsSvc.saveMFR(myQuestion);" tabindex="0"
                     checked="{{myQuestion.markForReview === true}}">
                 <span class="cset-icons-flag-dark fs-base"></span>
diff --git a/CSETWebNg/src/app/assessment/questions/questions.component.ts b/CSETWebNg/src/app/assessment/questions/questions.component.ts
index 28b1377188..b91131ab96 100644
--- a/CSETWebNg/src/app/assessment/questions/questions.component.ts
+++ b/CSETWebNg/src/app/assessment/questions/questions.component.ts
@@ -309,7 +309,7 @@ export class QuestionsComponent implements AfterViewChecked, OnInit, AfterViewIn
 
         this.categories = response.categories;
 
-        this.filterSvc.answerOptions = response.answerOptions;
+        this.filterSvc.answerOptions = response.answerOptions.slice();
         this.filterSvc.maturityModelId = 0;
 
         this.filterSvc.evaluateFiltersForCategories(this.categories);
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level-results/cmmc2-level-results.component.html b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level-results/cmmc2-level-results.component.html
index 04491efdcc..e63f6f4aef 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level-results/cmmc2-level-results.component.html
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level-results/cmmc2-level-results.component.html
@@ -43,8 +43,8 @@ <h3>{{t('titles.performance by level')}}</h3>
                     {{l.name}}
                 </div>
             </div>
-            <div id="chart" class="mb-3">
-                <canvas id="{{'level' + l.levelValue }}" style="max-width: 800px; margin: 0 auto;">{{l.chart}}</canvas>
+            <div id="chart" class="mb-3" style="max-width: 250px; min-width: 250px; max-height: 250px; min-height: 250px;"> 
+                <canvas id="{{'level' + l.levelValue }}" style="margin: 0 auto">{{l.chart}}</canvas>
             </div>
         </div>
     </div>
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level1-score/cmmc2-level1-score.component.html b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level1-score/cmmc2-level1-score.component.html
index 02c3d0a8a0..706567d392 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level1-score/cmmc2-level1-score.component.html
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level1-score/cmmc2-level1-score.component.html
@@ -35,13 +35,13 @@ <h5>{{t('level.level 1')}}</h5>
 
     <!-- Draw bar -->
     <g class="bars" transform="translate(30, 20)">
-      <rect x="0" y="50" [attr.width]="n(score)" height="20" fill="#921285" [matTooltip]="score"></rect>
+      <rect x="0" y="50" [attr.width]="n(score)" height="20" fill="#921285" [matTooltip]="t('reports.core.dashboard.score') + ': ' + score"></rect>
     </g>
 
     <!-- Axis line for current score -->
     <g transform="translate(30, -10)">
-      <line [attr.x1]="n(score)" [attr.x2]="n(score)" y1="55" y2="100" stroke="#aaa"></line>
-      <text [attr.x]="n(score)" y="50" font-size="10" text-anchor="middle">Score: {{score}}</text>
+      <line [attr.x1]="n(score)" [attr.x2]="n(score)" y1="55" y2="100" stroke="#555"></line>
+      <text [attr.x]="n(score)" y="50" font-size="10" text-anchor="middle">{{t('reports.core.dashboard.score')}}: {{score}}</text>
     </g>
   </svg>
 
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level1-score/cmmc2-level1-score.component.ts b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level1-score/cmmc2-level1-score.component.ts
index 8775747466..c01d8f1d16 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level1-score/cmmc2-level1-score.component.ts
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level1-score/cmmc2-level1-score.component.ts
@@ -21,7 +21,9 @@
 //  SOFTWARE.
 //
 ////////////////////////////////
-import { Component, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
+import { TranslocoService } from '@jsverse/transloco';
+import { TsaService } from '../../../../services/tsa.service';
 
 @Component({
   selector: 'app-cmmc2-level1-score',
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level2-score/cmmc2-level2-score.component.html b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level2-score/cmmc2-level2-score.component.html
index 4f6bd3b282..d9a74faf56 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level2-score/cmmc2-level2-score.component.html
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level2-score/cmmc2-level2-score.component.html
@@ -24,7 +24,7 @@
   <h5>{{t('level.level 2')}}</h5>
 
   <p *ngIf="!active">
-    {{t('cmmc.scoring.inactive description')}}
+    {{t('cmmc.scoring.inactive description 2')}}
   </p>
 
   <svg viewBox="0 0 800 120" [attr.width]="width" height="120" xmlns="http://www.w3.org/2000/svg"
@@ -43,22 +43,23 @@ <h5>{{t('level.level 2')}}</h5>
       <text [attr.x]="n(-203)" y="70" font-size="10" text-anchor="middle">-203</text>
       <text [attr.x]="n(-100)" y="70" font-size="10" text-anchor="middle">-100</text>
       <text [attr.x]="n(0)" y="70" font-size="10" text-anchor="middle">0</text>
-      <text [attr.x]="n(50)" y="70" font-size="10" text-anchor="middle">50</text>
       <text [attr.x]="n(110)" y="70" font-size="10" text-anchor="middle">110</text>
     </g>
 
     <!-- Draw bar -->
     <g class="bars" transform="translate(30, 20)">
-      <rect x="0" y="40" [attr.width]="width" height="20" fill="url(#barGradient)" [matTooltip]="'SPRS: ' + score" *ngIf="active">
+      <rect x="0" y="40" [attr.width]="width" height="20" fill="url(#barGradient)" 
+          [matTooltip]="t('reports.core.dashboard.sprs') + ': ' + score" *ngIf="active">
       </rect>
-      <rect x="0" y="40" [attr.width]="width" height="20" fill="white" stroke="#aaa" [matTooltip]="'SPRS: ' + score" *ngIf="!active">
+      <rect x="0" y="40" [attr.width]="width" height="20" fill="white" stroke="#aaa" 
+          [matTooltip]="t('reports.core.dashboard.sprs') + ': ' + score" *ngIf="!active">
      </rect>
     </g>
 
     <!-- Axis line for current score -->
     <g transform="translate(30, -10)">
-      <line [attr.x1]="n(score)" [attr.x2]="n(score)" y1="45" y2="90" stroke="#aaa"></line>
-      <text [attr.x]="n(score)" y="40" font-size="10" text-anchor="middle">Score: {{score}}</text>
+      <line [attr.x1]="n(score)" [attr.x2]="n(score)" y1="45" y2="90" stroke="#555"></line>
+      <text [attr.x]="n(score)" y="40" font-size="10" text-anchor="middle">{{t('reports.core.dashboard.sprs')}}: {{score}}</text>
     </g>
   </svg>
 
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level2-score/cmmc2-level2-score.component.scss b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level2-score/cmmc2-level2-score.component.scss
index 8229b63c11..7ae37b1c64 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level2-score/cmmc2-level2-score.component.scss
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level2-score/cmmc2-level2-score.component.scss
@@ -1,4 +1,4 @@
 .disabled-svg {
-     filter: grayscale(80%);
+     filter: grayscale(100%);
      opacity: 0.5;
  }
\ No newline at end of file
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level3-score/cmmc2-level3-score.component.html b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level3-score/cmmc2-level3-score.component.html
index 5be30ab389..93bb20999c 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level3-score/cmmc2-level3-score.component.html
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level3-score/cmmc2-level3-score.component.html
@@ -24,7 +24,7 @@
   <h5>{{t('level.level 3')}}</h5>
 
   <p *ngIf="!active">
-    {{t('cmmc.scoring.inactive description')}}
+    {{t('cmmc.scoring.inactive description 3')}}
   </p>
 
   <svg viewBox="0 0 800 120" [attr.width]="width" height="120" xmlns="http://www.w3.org/2000/svg"
@@ -39,14 +39,16 @@ <h5>{{t('level.level 3')}}</h5>
 
     <!-- Draw bar -->
     <g class="bars" transform="translate(30, 20)">
-      <rect x="0" y="50" [attr.width]="n(score)" height="20" fill="#034b61" [matTooltip]="score" *ngIf="active"></rect>
-      <rect x="0" y="50" [attr.width]="n(score)" height="20" fill="white" stroke="#aaa" [matTooltip]="score" *ngIf="!active"></rect>
+      <rect x="0" y="50" [attr.width]="n(score)" height="20" fill="#034b61"
+        [matTooltip]="t('reports.core.dashboard.score') + ': ' + score" *ngIf="active"></rect>
+      <rect x="0" y="50" [attr.width]="n(score)" height="20" fill="white" stroke="#aaa"
+        [matTooltip]="t('reports.core.dashboard.score') + ': ' + score" *ngIf="!active"></rect>
     </g>
 
     <!-- Axis line for current score -->
     <g transform="translate(30, -10)">
-      <line [attr.x1]="n(score)" [attr.x2]="n(score)" y1="55" y2="100" stroke="#aaa"></line>
-      <text [attr.x]="n(score)" y="50" font-size="10" text-anchor="middle">Score: {{score}}</text>
+      <line [attr.x1]="n(score)" [attr.x2]="n(score)" y1="55" y2="100" stroke="#555"></line>
+      <text [attr.x]="n(score)" y="50" font-size="10" text-anchor="middle">{{t('reports.core.dashboard.score')}}: {{score}}</text>
     </g>
   </svg>
 
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level3-score/cmmc2-level3-score.component.scss b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level3-score/cmmc2-level3-score.component.scss
index 8229b63c11..7ae37b1c64 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level3-score/cmmc2-level3-score.component.scss
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-level3-score/cmmc2-level3-score.component.scss
@@ -1,4 +1,4 @@
 .disabled-svg {
-     filter: grayscale(80%);
+     filter: grayscale(100%);
      opacity: 0.5;
  }
\ No newline at end of file
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-scores/cmmc2-scores.component.ts b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-scores/cmmc2-scores.component.ts
index 13b577616a..163db160aa 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-scores/cmmc2-scores.component.ts
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/cmmc2-scores/cmmc2-scores.component.ts
@@ -49,7 +49,6 @@ export class Cmmc2ScoresComponent implements OnInit {
    */
   ngOnInit(): void {
     this.maturitySvc.getCmmcScores().subscribe(x => {
-      console.log(x);
       this.scores = x;
     });
 
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/level-scorecard/level-scorecard.component.html b/CSETWebNg/src/app/assessment/results/mat-cmmc2/level-scorecard/level-scorecard.component.html
index 83d357f6c4..33ec10b610 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/level-scorecard/level-scorecard.component.html
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/level-scorecard/level-scorecard.component.html
@@ -27,7 +27,7 @@
           <th>
                {{ layoutSvc.hp ? t('cmmc.scoring.answer-abbr') : t('cmmc.scoring.answer-long') }}
           </th>
-          <th>
+          <th class="text-center">
                {{ layoutSvc.hp ? t('cmmc.scoring.deduct-abbr') : t('cmmc.scoring.deduct-long') }}
           </th>
      </tr>
@@ -47,7 +47,7 @@
                     <td class="align-top" [class.fw-bold]="q.score != 0" [innerHTML]="q.questionText"></td>
                     <td class="align-top" [class.fw-bold]="q.score != 0">{{t('answer-options.labels.' + q.answerText.toLowerCase() +
                          '-cmmc')}}</td>
-                    <td class="align-top align-end" [class.fw-bold]="q.score != 0">{{q.score == 0 ? '' : q.score}}</td>
+                    <td class="align-top text-center" [class.fw-bold]="q.score != 0">{{q.score == 0 ? '' : q.score}}</td>
                </tr>
           </ng-template>
      </ng-template>
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/sprs-score/sprs-score.component.html b/CSETWebNg/src/app/assessment/results/mat-cmmc2/sprs-score/sprs-score.component.html
index b779833d44..96e86ec986 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/sprs-score/sprs-score.component.html
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/sprs-score/sprs-score.component.html
@@ -20,7 +20,7 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
   SOFTWARE. 
 -------------------------->
-<div class="white-panel oy-auto d-flex flex-column flex-11a">
+<div class="white-panel oy-auto d-flex flex-column flex-11a" *transloco="let t">
   <h3>SPRS Score</h3>
 
   <div *ngIf="loading">
@@ -39,12 +39,15 @@ <h3>SPRS Score</h3>
 
       <h4>Scorecard</h4>
       <p>
-        The following is an accounting of CMMC Level 2 interpreted as your NIST 171 SPRS score.
+        The following is an accounting of CMMC Level 2 interpreted as your NIST 171 Supplier Performance Risk System
+        (SPRS) score.  Unmet practices are bolded.
+      </p>
+      <p>
         For more information on SPRS scoring methodology and preliminary requirements for its use, please refer to the
         tutorial.
       </p>
 
-      <table class="cset-table" [class.fs-smaller]="layoutSvc.hp">
+      <table class="table table-td-p2" style="width: 90%" [class.fs-smaller]="layoutSvc.hp">
         <tr>
           <th>Practice</th>
           <th></th>
@@ -52,21 +55,22 @@ <h4>Scorecard</h4>
             {{ layoutSvc.hp ? 'Resp' : 'Response' }}
           </th>
           <th>
-            {{ layoutSvc.hp ? 'Val' : 'Value' }}
+            {{ layoutSvc.hp ? 'Deduct' : 'Deduction' }}
           </th>
         </tr>
 
         <ng-template ngFor let-d [ngForOf]="response.domains">
-          <tr style="border-top: 1px solid #000; border-bottom: 1px solid #000; background-color: #fff;;">
-            <td colspan="4" class="h5">{{d.domainName}}</td>
+          <tr style="border-top: 1px solid #000; border-bottom: 1px solid #000;">
+            <td colspan="4" class="h5 py-2">{{d.domainName}}</td>
           </tr>
 
           <ng-template ngFor let-q [ngForOf]="d.questions">
             <tr>
-              <td class="text-nowrap align-top" [class.font-weight-bold]="q.score != 0">{{q.id}}</td>
-              <td class="align-top" [class.font-weight-bold]="q.score != 0" [innerHTML]="q.questionText"></td>
-              <td class="align-top" [class.font-weight-bold]="q.score != 0">{{q.answerText}}</td>
-              <td class="align-top" [class.font-weight-bold]="q.score != 0">{{q.score == 0 ? '' : q.score}}</td>
+              <td class="text-nowrap align-top" [class.fw-bold]="q.score != 0">{{q.id}}</td>
+              <td class="align-top" [class.fw-bold]="q.score != 0" [innerHTML]="q.questionText"></td>
+              <td class="align-top" [class.fw-bold]="q.score != 0">{{ t('answer-options.labels.' +
+                q.answerText.toLowerCase() + '-cmmc') }}</td>
+              <td class="align-top text-end" [class.fw-bold]="q.score != 0">{{q.score == 0 ? '' : q.score}}</td>
             </tr>
           </ng-template>
         </ng-template>
diff --git a/CSETWebNg/src/app/assessment/results/mat-cmmc2/sprs-score/sprs-score.component.ts b/CSETWebNg/src/app/assessment/results/mat-cmmc2/sprs-score/sprs-score.component.ts
index 4e4188af99..a57a820d27 100644
--- a/CSETWebNg/src/app/assessment/results/mat-cmmc2/sprs-score/sprs-score.component.ts
+++ b/CSETWebNg/src/app/assessment/results/mat-cmmc2/sprs-score/sprs-score.component.ts
@@ -45,7 +45,7 @@ export class SprsScoreComponent implements OnInit {
   ) { }
 
   ngOnInit(): void {
-    this.maturitySvc.getSPRSScore().subscribe(result => {
+    this.maturitySvc.getSprsScore().subscribe(result => {
       this.response = result;
       this.sprsGauge = this.response.gaugeSvg;
 
diff --git a/CSETWebNg/src/app/models/questions.model.ts b/CSETWebNg/src/app/models/questions.model.ts
index cf18462a1e..916b5f6394 100644
--- a/CSETWebNg/src/app/models/questions.model.ts
+++ b/CSETWebNg/src/app/models/questions.model.ts
@@ -144,6 +144,7 @@ export interface Question {
     questionText: string;
     parmSubs: SubToken[];
     stdRefId: string;
+    answerOptions: string[];
     answer_Id: number;
     answer: string;
     altAnswerText: string;
diff --git a/CSETWebNg/src/app/reports/cmmc2/executive-cmmc2/executive-cmmc2.component.ts b/CSETWebNg/src/app/reports/cmmc2/executive-cmmc2/executive-cmmc2.component.ts
index 0ccbce5a35..78f05632a7 100644
--- a/CSETWebNg/src/app/reports/cmmc2/executive-cmmc2/executive-cmmc2.component.ts
+++ b/CSETWebNg/src/app/reports/cmmc2/executive-cmmc2/executive-cmmc2.component.ts
@@ -81,7 +81,7 @@ export class ExecutiveCMMC2Component implements OnInit, AfterViewInit {
       error => console.log('Executive report load Error: ' + (<Error>error).message)
     );
 
-    this.maturitySvc.getSPRSScore().subscribe((r: any) => {
+    this.maturitySvc.getSprsScore().subscribe((r: any) => {
       this.responseSprs = r;
       this.sprsGauge = this.responseSprs.gaugeSvg;
     });
diff --git a/CSETWebNg/src/app/services/filtering/maturity-filtering/maturity-filtering.service.ts b/CSETWebNg/src/app/services/filtering/maturity-filtering/maturity-filtering.service.ts
index 4ac547fdfb..2423301683 100644
--- a/CSETWebNg/src/app/services/filtering/maturity-filtering/maturity-filtering.service.ts
+++ b/CSETWebNg/src/app/services/filtering/maturity-filtering/maturity-filtering.service.ts
@@ -58,7 +58,7 @@ export class MaturityFilteringService {
   /**
    * The allowable filter values.  Used for "select all"
    */
-  readonly allowableFilters = ['Y', 'N', 'NA', 'A', 'U', 'C', 'M', 'O', 'FB', 'MT', 'MT+', 'FR', 'FI', 'LI', 'PI', 'NI'];
+  readonly allowableFilters = ['Y', 'N', 'NA', 'A', 'I', 'S', 'U', 'C', 'M', 'O', 'FB', 'MT', 'MT+', 'FR', 'FI', 'LI', 'PI', 'NI'];
 
   /**
    * The allowable maturity filter values.  Only applicable on maturity questions page.
@@ -77,7 +77,7 @@ export class MaturityFilteringService {
   /**
    * Filters that are turned on at the start.
    */
-  public defaultFilterSettings = ['Y', 'N', 'NA', 'A', 'U', 'C', 'M', 'O', 'FB', 'MT', 'FR', 'FI', 'LI', 'PI', 'NI'];
+  public defaultFilterSettings = ['Y', 'N', 'NA', 'A', 'I', 'S', 'U', 'C', 'M', 'O', 'FB', 'MT', 'FR', 'FI', 'LI', 'PI', 'NI'];
 
   /**
    * If the user enters characters into the box, only questions containing that string
@@ -88,7 +88,7 @@ export class MaturityFilteringService {
   /**
    * Valid 'answer'-type filter values
    */
-  public answerOptions: string[] = ['Y', 'N', 'NA', 'A', 'U', 'FI', 'LI', 'PI', 'NI'];
+  public answerOptions: string[] = ['Y', 'N', 'NA', 'A', 'I', 'S', 'U', 'FI', 'LI', 'PI', 'NI'];
 
 
 
@@ -256,7 +256,6 @@ export class MaturityFilteringService {
 
     if (g.groupingType == 'Domain') {
       this.currentDomainName = g.title;
-
     }
 
     g.visible = true;
@@ -265,7 +264,6 @@ export class MaturityFilteringService {
       // start with false, then set true if the question should be shown
       q.visible = false;
 
-
       // Check maturity level filtering first.  If the question is not visible the rest of the
       // conditions can be avoided.
       switch (this.assesmentSvc.assessment.maturityModel.modelName) {
@@ -290,7 +288,7 @@ export class MaturityFilteringService {
         case 'CRR':
           this.crrFilteringSvc.setQuestionVisibility(q);
           break;
-          
+
         case 'RRA':
           this.rraFilteringSvc.setQuestionVisibility(q);
           break;
@@ -314,6 +312,14 @@ export class MaturityFilteringService {
         return;
       }
 
+      // add any question-specific answer options to the filter service
+      q.answerOptions?.forEach(opt => {
+        if (!filterSvc.answerOptions.includes(opt)) {
+          filterSvc.answerOptions.push(opt);
+        }
+      });
+
+
       // evaluate answers
       if (filterSvc.answerOptions.includes(q.answer) && filterSvc.showFilters.includes(q.answer)) {
         q.visible = true;
diff --git a/CSETWebNg/src/app/services/filtering/question-filter.service.ts b/CSETWebNg/src/app/services/filtering/question-filter.service.ts
index be667aa667..fb18a640f4 100644
--- a/CSETWebNg/src/app/services/filtering/question-filter.service.ts
+++ b/CSETWebNg/src/app/services/filtering/question-filter.service.ts
@@ -245,7 +245,7 @@ export class QuestionFilterService {
             if (this.answerOptions.includes(q.answer) && this.showFilters.includes(q.answer)) {
               q.visible = true;
             }
-
+          
             // consider null answers as 'U'
             if ((q.answer == null || q.answer == 'U') && this.showFilters.includes('U')) {
               q.visible = true;
@@ -328,7 +328,6 @@ export class QuestionFilterService {
     }
 
     const filterStringLowerCase = this.filterSearchString.toLowerCase();
-    console.log(domains)
 
     if (matLevel == 5) {
       domains.forEach(d => {
diff --git a/CSETWebNg/src/assets/i18n/en.json b/CSETWebNg/src/assets/i18n/en.json
index befe74445f..68fa846bb0 100644
--- a/CSETWebNg/src/assets/i18n/en.json
+++ b/CSETWebNg/src/assets/i18n/en.json
@@ -628,7 +628,8 @@
       "score charts description 1": "The following chart(s) illustrate the organization's progress in meeting the cybersecurity standards evaluated in the CMMC assessment. This page provides data based on the level selected on the CMMC Target Level Selection page (e.g., if the user selects a target level of 2, charts for both Level 1 and Level 2 will display). This approach ensures clarity and focus on the immediate requirements.",
       "score charts description 2": "Scoring within the CMMC program is cumulative, meaning organizations must achieve compliance in all previous levels before advancing to the next one. For instance, an organization must complete the requirements for Level 1 and Level 2 before progressing to Level 3.",
       "score charts description 3": "For further guidance, refer to the CMMC Tutorial within the Prepare section. A link to CMMC documentation is also available in the Additional Resources section.",
-      "inactive description": "The following chart displays the organization’s current progress within the level, independent of the CMMC program's cumulative scoring requirements, and without consideration for the progress made in previous levels. Please note that the level is not considered achieved, as the organization has not met the compliance requirements for the preceding level(s).",
+      "inactive description 2": "Please note that Level 2 is not enabled, as the organization has not met the compliance requirements for Level 1.",
+      "inactive description 3": "Please note that Level 3 is not enabled, as the organization has not met the compliance requirements for Level 2.",
       "scorecard description": "The table below lists all practices and their corresponding responses, organized by level and then by the individual domain. Additionally, if a requirement is not met, the points deducted from the total score are shown in the Deduction column.",
       "practice": "Practice",
       "answer-long": "Answer",
@@ -1072,7 +1073,8 @@
         "standard based": "Standard Based",
         "component based": "Component Based",
         "no standards answers": "No Standards Answers",
-        "no components answers": "No Components Answers"
+        "no components answers": "No Components Answers",
+        "sprs": "SPRS"
       },
       "executive summary": {
         "report title": "Executive Summary",
@@ -2011,7 +2013,7 @@
       "23b": "Potential Assessment Methods and Objectives",
       "23c": "Discussion points and examples",
       "24": "Select the Reference icon to view additional documents and links to the standards associated with the requirement.",
-      "25": "Answer Buttons",
+      "25": "Answer Options",
       "26": "Select the applicable answer for each question. Unanswered questions are calculated as a “Not” response.",
       "26a": "<b>Met</b> - indicates the contractor has successfully <b>MET</b> all applicable objectives for the requirement.",
       "26b": "<b>Not</b> - indicates the contractor has <b>NOT MET</b> all applicable objectives for the requirement.",
diff --git a/CSETWebNg/src/assets/images/CMMC/tutorial2/Picture2F.png b/CSETWebNg/src/assets/images/CMMC/tutorial2/Picture2F.png
index 1fd6673517..93de554b0c 100644
Binary files a/CSETWebNg/src/assets/images/CMMC/tutorial2/Picture2F.png and b/CSETWebNg/src/assets/images/CMMC/tutorial2/Picture2F.png differ
diff --git a/CSETWebNg/src/assets/navigation/workflow-omni.xml b/CSETWebNg/src/assets/navigation/workflow-omni.xml
index 59f5be6b9f..41c7ea3681 100644
--- a/CSETWebNg/src/assets/navigation/workflow-omni.xml
+++ b/CSETWebNg/src/assets/navigation/workflow-omni.xml
@@ -322,7 +322,7 @@
 
     <!-- Results Phase -->
     <node d="results" id="phase-results" visible="CF-DEMOGRAPHICS-COMPLETE" enabled="CF-ASSESSMENT-COMPLETE">
-    <node displaytext="Assessment Analytics" id="analytics-results-page" path="assessment/{:id}/results/analytics-results-page" visible="MATURITY-ANY(2,6,3,4,5,1,8,13,9,11,14)" />
+    <node displaytext="Assessment Analytics" id="analytics-results-page" path="assessment/{:id}/results/analytics-results-page" visible="MATURITY-ANY(2,6,3,4,5,1,8,13,9,11,14,19)" />
 
         <!-- Results - Standards -->
         <node d="standard results" visible="OPTION:STANDARD">