diff --git a/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs b/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs
index b6d3a706a..8a4ee438a 100644
--- a/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs
+++ b/LearningHub.Nhs.WebUI/Controllers/Api/ContributeController.cs
@@ -668,7 +668,7 @@ private async Task RemoveBlockCollectionFiles(int resourceVersionId, BlockCollec
                         {
                             foreach (var oldblock in existingAttachements)
                             {
-                                var entry = newBlocks.FirstOrDefault(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Attachment && x.MediaBlock.Attachment != null && x.MediaBlock.Attachment.File?.FileId == oldblock.MediaBlock.Attachment?.File?.FileId);
+                                var entry = newBlocks.FirstOrDefault(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Attachment && x.MediaBlock.Attachment != null && (x.MediaBlock.Attachment.File?.FileId == oldblock.MediaBlock.Attachment?.File?.FileId || x.MediaBlock.Attachment.File?.FilePath == oldblock.MediaBlock.Attachment?.File?.FilePath));
                                 if (entry == null)
                                 {
                                     filePaths.Add(oldblock.MediaBlock.Attachment?.File?.FilePath);
@@ -681,7 +681,7 @@ private async Task RemoveBlockCollectionFiles(int resourceVersionId, BlockCollec
                         {
                             foreach (var oldblock in existingVideos)
                             {
-                                var entry = newBlocks.FirstOrDefault(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Video && x.MediaBlock.Video != null && x.MediaBlock.Video.VideoFile?.File?.FileId == oldblock.MediaBlock?.Video?.VideoFile?.File?.FileId);
+                                var entry = newBlocks.FirstOrDefault(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Video && x.MediaBlock.Video != null && (x.MediaBlock.Video.VideoFile?.File?.FileId == oldblock.MediaBlock?.Video?.VideoFile?.File?.FileId || x.MediaBlock.Video.VideoFile?.File?.FilePath == oldblock.MediaBlock?.Video?.VideoFile?.File?.FilePath));
                                 if (entry == null)
                                 {
                                     if (!string.IsNullOrWhiteSpace(oldblock.MediaBlock.Video.File.FilePath))
@@ -707,7 +707,7 @@ private async Task RemoveBlockCollectionFiles(int resourceVersionId, BlockCollec
                         {
                             foreach (var oldblock in existingImages)
                             {
-                               var entry = newBlocks.FirstOrDefault(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Image && x.MediaBlock.Image != null && x.MediaBlock?.Image?.File?.FileId == oldblock.MediaBlock?.Image?.File?.FileId);
+                               var entry = newBlocks.FirstOrDefault(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Image && x.MediaBlock.Image != null && (x.MediaBlock?.Image?.File?.FileId == oldblock.MediaBlock?.Image?.File?.FileId || x.MediaBlock?.Image?.File?.FilePath == oldblock.MediaBlock?.Image?.File?.FilePath));
                                if (entry == null)
                                 {
                                     filePaths.Add(oldblock?.MediaBlock?.Image?.File?.FilePath);
@@ -722,7 +722,7 @@ private async Task RemoveBlockCollectionFiles(int resourceVersionId, BlockCollec
                             {
                                 foreach (var oldblock in imageBlock?.ImageCarouselBlock?.ImageBlockCollection?.Blocks)
                                 {
-                                    var entry = newBlocks.FirstOrDefault(x => x.BlockType == BlockType.ImageCarousel && x.ImageCarouselBlock != null && x.ImageCarouselBlock.ImageBlockCollection != null && x.ImageCarouselBlock.ImageBlockCollection.Blocks != null && x.ImageCarouselBlock.ImageBlockCollection.Blocks.Where(x => x.MediaBlock?.Image?.File?.FileId == oldblock.MediaBlock?.Image?.File?.FileId).Any());
+                                    var entry = newBlocks.FirstOrDefault(x => x.BlockType == BlockType.ImageCarousel && x.ImageCarouselBlock != null && x.ImageCarouselBlock.ImageBlockCollection != null && x.ImageCarouselBlock.ImageBlockCollection.Blocks != null && x.ImageCarouselBlock.ImageBlockCollection.Blocks.Where(x => x.MediaBlock?.Image?.File?.FileId == oldblock.MediaBlock?.Image?.File?.FileId || x.MediaBlock?.Image?.File?.FilePath == oldblock.MediaBlock?.Image?.File?.FilePath).Any());
                                     if (entry == null)
                                     {
                                         filePaths.Add(oldblock.MediaBlock?.Image?.File?.FilePath);
@@ -738,7 +738,7 @@ private async Task RemoveBlockCollectionFiles(int resourceVersionId, BlockCollec
                             {
                                 foreach (var oldblock in wsi?.WholeSlideImageBlock?.WholeSlideImageBlockItems)
                                 {
-                                    var entry = newBlocks.FirstOrDefault(x => x.WholeSlideImageBlock != null && x.WholeSlideImageBlock.WholeSlideImageBlockItems.Where(x => x.WholeSlideImage?.File?.FileId == oldblock.WholeSlideImage?.File?.FileId).Any());
+                                    var entry = newBlocks.FirstOrDefault(x => x.WholeSlideImageBlock != null && x.WholeSlideImageBlock.WholeSlideImageBlockItems.Where(x => x.WholeSlideImage?.File?.FileId == oldblock.WholeSlideImage?.File?.FileId || x.WholeSlideImage?.File?.FilePath == oldblock.WholeSlideImage?.File?.FilePath).Any());
                                     if (entry == null)
                                     {
                                         filePaths.Add(oldblock.WholeSlideImage?.File?.FilePath);
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/AssessmentContentBlockCollectionGetAll.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/AssessmentContentBlockCollectionGetAll.sql
new file mode 100644
index 000000000..5fd15075a
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/AssessmentContentBlockCollectionGetAll.sql	
@@ -0,0 +1,339 @@
+-------------------------------------------------------------------------------
+-- Author       Tobi Awe
+-- Created      30-05-2024
+-- Purpose      Get all assessment content block collections of all undeleted resource version including published(current version only) versions while excluding the version being edited. 
+--
+-- Modification History
+--
+-- 30-05-2024  TD-3023	Initial Revision
+-------------------------------------------------------------------------------
+CREATE PROCEDURE [resources].[AssessmentContentBlockCollectionGetAll] (
+	@excludeResourceVersionId INT
+)
+AS
+BEGIN
+    -- Table to hold BlockCollectionIds
+    DECLARE @BlockCollectionId TABLE (Id INT);
+
+    -- Insert BlockCollectionIds based on the provided query
+    INSERT INTO @BlockCollectionId (Id)
+    SELECT DISTINCT [c].AssessmentContentId as [BlockCollectionId]
+    FROM [resources].AssessmentResourceVersion AS [c]
+    INNER JOIN (
+        SELECT [r].[Id], [r].[ResourceId], [r].[VersionStatusId]
+        FROM [resources].[ResourceVersion] AS [r]
+        WHERE [r].[Deleted] = CAST(0 AS bit)
+    ) AS [t] ON [c].[ResourceVersionId] = [t].[Id]
+    INNER JOIN (
+        SELECT [r0].[Id], [r0].[CurrentResourceVersionId]
+        FROM [resources].[Resource] AS [r0]
+        WHERE [r0].[Deleted] = CAST(0 AS bit)
+    ) AS [t0] ON [t].[ResourceId] = [t0].[Id]
+    WHERE ([c].[Deleted] = CAST(0 AS bit)) 
+      AND ((([c].[ResourceVersionId] <> @excludeResourceVersionId) 
+            AND ([c].[Deleted] = CAST(0 AS bit))) 
+           AND (([t].[VersionStatusId] <> 2) 
+                OR (([t].[VersionStatusId] = 2) 
+                    AND ([t0].[CurrentResourceVersionId] = [c].[ResourceVersionId])))) 
+      AND [c].AssessmentContentId IS NOT NULL;
+
+    -- Table to hold results for blocks
+    DECLARE @BlockResult TABLE (
+        Id INT,
+        [Order] INT,
+        Title NVARCHAR(200),
+        BlockType INT,
+        BlockCollectionId INT
+    );
+
+    -- Insert block data
+    INSERT INTO @BlockResult
+    SELECT Id, [Order], Title, BlockType, BlockCollectionId
+    FROM resources.Block
+    WHERE Deleted = 0 AND BlockCollectionId IN (SELECT Id FROM @BlockCollectionId);
+
+    -- Select block data
+    SELECT br.Id, [Order], Title, BlockType, BlockCollectionId
+    FROM @BlockResult br
+    JOIN @BlockCollectionId bc ON br.BlockCollectionId = bc.Id;
+
+    -- Select text block data
+    SELECT t.*
+    FROM resources.TextBlock t
+    INNER JOIN @BlockResult b ON b.Id = t.BlockId
+    WHERE t.Deleted = 0;
+
+    -- WholeSlide Image Block
+    DECLARE @WsibResult TABLE (
+        Id INT,
+        BlockId INT
+    );
+
+    INSERT INTO @WsibResult
+    SELECT w.Id, w.BlockId
+    FROM resources.WholeSlideImageBlock w
+    INNER JOIN @BlockResult b ON b.Id = w.BlockId
+    WHERE w.Deleted = 0;
+
+    SELECT * FROM @WsibResult;
+
+    -- WholeSlide Image Block Items
+    DECLARE @WsibiResult TABLE (
+        Id INT,
+        WholeSlideImageBlockId INT,
+        WholeSlideImageId INT,
+        PlaceholderText NVARCHAR(255),
+        [Order] INT
+    );
+
+    INSERT INTO @WsibiResult
+    SELECT wi.Id, wi.WholeSlideImageBlockId, wi.WholeSlideImageId, wi.PlaceholderText, wi.[Order]
+    FROM resources.WholeSlideImageBlockItem wi
+    INNER JOIN @WsibResult w ON wi.WholeSlideImageBlockId = w.Id
+    WHERE wi.Deleted = 0;
+
+    SELECT * FROM @WsibiResult;
+
+    -- WholeSlide Image
+    DECLARE @WsiResult TABLE (
+        Id INT,
+        Title NVARCHAR(1000),
+        FileId INT
+    );
+
+    INSERT INTO @WsiResult
+    SELECT wsi.Id, wsi.Title, wsi.FileId
+    FROM resources.WholeSlideImage wsi
+    INNER JOIN @WsibiResult wi ON wsi.Id = wi.WholeSlideImageId
+    WHERE wsi.Deleted = 0;
+
+    SELECT * FROM @WsiResult;
+
+    -- WholeSlide Image File
+    DECLARE @WsiFileResult TABLE (
+        Id INT,
+        FileTypeId INT,
+        FileChunkDetailId INT,
+        [FileName] NVARCHAR(255),
+        FilePath NVARCHAR(1024),
+        FileSizekb INT
+    );
+
+    INSERT INTO @WsiFileResult
+    SELECT f.Id, f.FileTypeId, f.FileChunkDetailId, f.[FileName], f.FilePath, f.FileSizeKb
+    FROM resources.[File] f
+    INNER JOIN @WsiResult wsi ON f.Id = wsi.FileId
+    WHERE f.Deleted = 0;
+
+    SELECT * FROM @WsiFileResult;
+
+    -- WholeSlide Image File - Partial File
+    SELECT pf.*
+    FROM resources.PartialFile pf
+    INNER JOIN @WsiFileResult wsi ON pf.FileId = wsi.Id
+    WHERE pf.Deleted = 0;
+
+    -- WholeSlide Image File - Image File
+    SELECT wsif.*
+    FROM resources.WholeSlideImageFile wsif
+    INNER JOIN @WsiFileResult wsi ON wsif.FileId = wsi.Id
+    WHERE wsif.Deleted = 0;
+
+    -- WholeSlide Image Annotation
+    DECLARE @WsiaResult TABLE (
+        Id INT,
+        WholeSlideImageId INT,
+        ImageId INT,
+        [Order] INT,
+        Label NVARCHAR(255),
+        Description NVARCHAR(1000),
+        PinXCoordinate DECIMAL(22,19),
+        PinYCoordinate DECIMAL(22,19),
+        Colour INT
+    );
+
+    INSERT INTO @WsiaResult
+    SELECT ia.Id, ia.WholeSlideImageId, ia.ImageId, ia.[Order], ia.Label, ia.Description, ia.PinXCoordinate, ia.PinYCoordinate, ia.Colour
+    FROM resources.ImageAnnotation ia
+    INNER JOIN @WsiResult wsi ON ia.WholeSlideImageId = wsi.Id
+    WHERE ia.Deleted = 0;
+
+    SELECT * FROM @WsiaResult;
+
+    -- WholeSlide Image Annotation Mark
+    SELECT iam.*
+    FROM resources.ImageAnnotationMark iam
+    INNER JOIN @WsiaResult wsia ON iam.ImageAnnotationId = wsia.Id
+    WHERE iam.Deleted = 0;
+
+    -- Media Block
+    DECLARE @MediaBlockResult TABLE (
+        Id INT,
+        BlockId INT,
+        MediaType INT,
+        AttachmentId INT,
+        ImageId INT,
+        VideoId INT
+    );
+
+    INSERT INTO @MediaBlockResult
+    SELECT mb.Id, mb.BlockId, mb.MediaType, mb.AttachmentId, mb.ImageId, mb.VideoId
+    FROM resources.MediaBlock mb
+    INNER JOIN @BlockResult b ON mb.BlockId = b.Id
+    WHERE mb.Deleted = 0;
+
+    SELECT * FROM @MediaBlockResult;
+
+    -- Attachment
+    DECLARE @AttachmentResult TABLE (
+        Id INT,
+        FileId INT
+    );
+
+    INSERT INTO @AttachmentResult
+    SELECT a.Id, a.FileId
+    FROM resources.Attachment a
+    INNER JOIN @MediaBlockResult mb ON a.Id = mb.AttachmentId
+    WHERE a.Deleted = 0;
+
+    SELECT * FROM @AttachmentResult;
+
+    -- Attachment File
+    DECLARE @AttachmentFileResult TABLE (
+        Id INT,
+        FileTypeId INT,
+        FileChunkDetailId INT,
+        [FileName] NVARCHAR(255),
+        FilePath NVARCHAR(1024),
+        FileSizekb INT
+    );
+
+    INSERT INTO @AttachmentFileResult
+    SELECT f.Id, f.FileTypeId, f.FileChunkDetailId, f.[FileName], f.FilePath, f.FileSizeKb
+    FROM resources.[File] f
+    INNER JOIN @AttachmentResult ar ON f.Id = ar.FileId
+    WHERE f.Deleted = 0;
+
+    SELECT * FROM @AttachmentFileResult;
+
+    -- Attachment File - Partial File
+    SELECT pf.*
+    FROM resources.PartialFile pf
+    INNER JOIN @AttachmentFileResult af ON pf.FileId = af.Id
+    WHERE pf.Deleted = 0;
+
+    -- Image
+    DECLARE @ImageResult TABLE (
+        Id INT,
+        FileId INT,
+        AltText NVARCHAR(125),
+        Description NVARCHAR(250)
+    );
+
+    INSERT INTO @ImageResult
+    SELECT i.Id, i.FileId, i.AltText, i.Description
+    FROM resources.Image i
+    INNER JOIN @MediaBlockResult mb ON i.Id = mb.ImageId
+    WHERE i.Deleted = 0;
+
+    SELECT * FROM @ImageResult;
+
+    -- Image File
+    DECLARE @ImageFileResult TABLE (
+        Id INT,
+        FileTypeId INT,
+        FileChunkDetailId INT,
+        [FileName] NVARCHAR(255),
+        FilePath NVARCHAR(1024),
+        FileSizekb INT
+    );
+
+    INSERT INTO @ImageFileResult
+    SELECT f.Id, f.FileTypeId, f.FileChunkDetailId, f.[FileName], f.FilePath, f.FileSizeKb
+    FROM resources.[File] f
+    INNER JOIN @ImageResult ir ON f.Id = ir.FileId
+    WHERE f.Deleted = 0;
+
+    SELECT * FROM @ImageFileResult;
+
+    -- Image File - Partial File
+    SELECT pf.*
+    FROM resources.PartialFile pf
+    INNER JOIN @ImageFileResult ifr ON pf.FileId = ifr.Id
+    WHERE pf.Deleted = 0;
+
+    -- Video
+    DECLARE @VideoResult TABLE (
+        Id INT,
+        FileId INT
+    );
+
+    INSERT INTO @VideoResult
+    SELECT v.Id, v.FileId
+    FROM resources.Video v
+    INNER JOIN @MediaBlockResult mb ON v.Id = mb.VideoId
+    WHERE v.Deleted = 0;
+
+    SELECT * FROM @VideoResult;
+
+    -- Video File
+    DECLARE @VideoFileResult TABLE (
+        Id INT,
+        FileTypeId INT,
+        FileChunkDetailId INT,
+        [FileName] NVARCHAR(255),
+        FilePath NVARCHAR(1024),
+        FileSizekb INT
+    );
+
+    INSERT INTO @VideoFileResult
+    SELECT f.Id, f.FileTypeId, f.FileChunkDetailId, f.[FileName], f.FilePath, f.FileSizeKb
+    FROM resources.[File] f
+    INNER JOIN @VideoResult vr ON f.Id = vr.FileId
+    WHERE f.Deleted = 0;
+
+    SELECT * FROM @VideoFileResult;
+
+    -- Video File - Partial File
+    SELECT pf.*
+    FROM resources.PartialFile pf
+    INNER JOIN @VideoFileResult vf ON pf.FileId = vf.Id
+    WHERE pf.Deleted = 0;
+
+    -- Video File Detail
+    SELECT vf.*
+    FROM resources.VideoFile vf
+    INNER JOIN @VideoFileResult vfr ON vf.FileId = vfr.Id
+    WHERE vf.Deleted = 0;
+
+    -- Question Block
+    DECLARE @QuestionResult TABLE (
+        Id INT,
+        BlockId INT,
+        QuestionBlockCollectionId INT,
+        FeedbackBlockCollectionId INT,
+        QuestionType INT,
+        AllowReveal BIT
+    );
+
+    INSERT INTO @QuestionResult
+    SELECT qb.Id, qb.BlockId, qb.QuestionBlockCollectionId, qb.FeedbackBlockCollectionId, qb.QuestionType, qb.AllowReveal
+    FROM resources.QuestionBlock qb
+    INNER JOIN @BlockResult b ON qb.BlockId = b.Id
+    WHERE qb.Deleted = 0;
+
+    SELECT * FROM @QuestionResult;
+
+    -- Question Answer
+    SELECT qa.*
+    FROM resources.QuestionAnswer qa
+    INNER JOIN @QuestionResult qr ON qa.QuestionBlockId = qr.Id
+    WHERE qa.Deleted = 0;
+
+    -- Image Carousel Block
+    SELECT icb.*
+    FROM resources.ImageCarouselBlock icb
+    INNER JOIN @BlockResult b ON icb.BlockId = b.Id
+    WHERE icb.Deleted = 0;
+END
+GO
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/AssessmentGuidanceBlockCollectionGetAll.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/AssessmentGuidanceBlockCollectionGetAll.sql
new file mode 100644
index 000000000..f8e96a7ba
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/AssessmentGuidanceBlockCollectionGetAll.sql	
@@ -0,0 +1,339 @@
+-------------------------------------------------------------------------------
+-- Author       Tobi Awe
+-- Created      30-05-2024
+-- Purpose      Get all assessment guidance block collections of all undeleted resource version including published(current version only) versions while excluding the version being edited. 
+--
+-- Modification History
+--
+-- 30-05-2024  TD-3023	Initial Revision
+-------------------------------------------------------------------------------
+CREATE PROCEDURE [resources].[AssessmentGuidanceBlockCollectionGetAll] (
+	@excludeResourceVersionId INT
+)
+AS
+BEGIN
+    -- Table to hold BlockCollectionIds
+    DECLARE @BlockCollectionId TABLE (Id INT);
+
+    -- Insert BlockCollectionIds based on the provided query
+    INSERT INTO @BlockCollectionId (Id)
+    SELECT DISTINCT [c].EndGuidanceId as [BlockCollectionId]
+    FROM [resources].AssessmentResourceVersion AS [c]
+    INNER JOIN (
+        SELECT [r].[Id], [r].[ResourceId], [r].[VersionStatusId]
+        FROM [resources].[ResourceVersion] AS [r]
+        WHERE [r].[Deleted] = CAST(0 AS bit)
+    ) AS [t] ON [c].[ResourceVersionId] = [t].[Id]
+    INNER JOIN (
+        SELECT [r0].[Id], [r0].[CurrentResourceVersionId]
+        FROM [resources].[Resource] AS [r0]
+        WHERE [r0].[Deleted] = CAST(0 AS bit)
+    ) AS [t0] ON [t].[ResourceId] = [t0].[Id]
+    WHERE ([c].[Deleted] = CAST(0 AS bit)) 
+      AND ((([c].[ResourceVersionId] <> @excludeResourceVersionId) 
+            AND ([c].[Deleted] = CAST(0 AS bit))) 
+           AND (([t].[VersionStatusId] <> 2) 
+                OR (([t].[VersionStatusId] = 2) 
+                    AND ([t0].[CurrentResourceVersionId] = [c].[ResourceVersionId])))) 
+      AND [c].EndGuidanceId IS NOT NULL;
+
+    -- Table to hold results for blocks
+    DECLARE @BlockResult TABLE (
+        Id INT,
+        [Order] INT,
+        Title NVARCHAR(200),
+        BlockType INT,
+        BlockCollectionId INT
+    );
+
+    -- Insert block data
+    INSERT INTO @BlockResult
+    SELECT Id, [Order], Title, BlockType, BlockCollectionId
+    FROM resources.Block
+    WHERE Deleted = 0 AND BlockCollectionId IN (SELECT Id FROM @BlockCollectionId);
+
+    -- Select block data
+    SELECT br.Id, [Order], Title, BlockType, BlockCollectionId
+    FROM @BlockResult br
+    JOIN @BlockCollectionId bc ON br.BlockCollectionId = bc.Id;
+
+    -- Select text block data
+    SELECT t.*
+    FROM resources.TextBlock t
+    INNER JOIN @BlockResult b ON b.Id = t.BlockId
+    WHERE t.Deleted = 0;
+
+    -- WholeSlide Image Block
+    DECLARE @WsibResult TABLE (
+        Id INT,
+        BlockId INT
+    );
+
+    INSERT INTO @WsibResult
+    SELECT w.Id, w.BlockId
+    FROM resources.WholeSlideImageBlock w
+    INNER JOIN @BlockResult b ON b.Id = w.BlockId
+    WHERE w.Deleted = 0;
+
+    SELECT * FROM @WsibResult;
+
+    -- WholeSlide Image Block Items
+    DECLARE @WsibiResult TABLE (
+        Id INT,
+        WholeSlideImageBlockId INT,
+        WholeSlideImageId INT,
+        PlaceholderText NVARCHAR(255),
+        [Order] INT
+    );
+
+    INSERT INTO @WsibiResult
+    SELECT wi.Id, wi.WholeSlideImageBlockId, wi.WholeSlideImageId, wi.PlaceholderText, wi.[Order]
+    FROM resources.WholeSlideImageBlockItem wi
+    INNER JOIN @WsibResult w ON wi.WholeSlideImageBlockId = w.Id
+    WHERE wi.Deleted = 0;
+
+    SELECT * FROM @WsibiResult;
+
+    -- WholeSlide Image
+    DECLARE @WsiResult TABLE (
+        Id INT,
+        Title NVARCHAR(1000),
+        FileId INT
+    );
+
+    INSERT INTO @WsiResult
+    SELECT wsi.Id, wsi.Title, wsi.FileId
+    FROM resources.WholeSlideImage wsi
+    INNER JOIN @WsibiResult wi ON wsi.Id = wi.WholeSlideImageId
+    WHERE wsi.Deleted = 0;
+
+    SELECT * FROM @WsiResult;
+
+    -- WholeSlide Image File
+    DECLARE @WsiFileResult TABLE (
+        Id INT,
+        FileTypeId INT,
+        FileChunkDetailId INT,
+        [FileName] NVARCHAR(255),
+        FilePath NVARCHAR(1024),
+        FileSizekb INT
+    );
+
+    INSERT INTO @WsiFileResult
+    SELECT f.Id, f.FileTypeId, f.FileChunkDetailId, f.[FileName], f.FilePath, f.FileSizeKb
+    FROM resources.[File] f
+    INNER JOIN @WsiResult wsi ON f.Id = wsi.FileId
+    WHERE f.Deleted = 0;
+
+    SELECT * FROM @WsiFileResult;
+
+    -- WholeSlide Image File - Partial File
+    SELECT pf.*
+    FROM resources.PartialFile pf
+    INNER JOIN @WsiFileResult wsi ON pf.FileId = wsi.Id
+    WHERE pf.Deleted = 0;
+
+    -- WholeSlide Image File - Image File
+    SELECT wsif.*
+    FROM resources.WholeSlideImageFile wsif
+    INNER JOIN @WsiFileResult wsi ON wsif.FileId = wsi.Id
+    WHERE wsif.Deleted = 0;
+
+    -- WholeSlide Image Annotation
+    DECLARE @WsiaResult TABLE (
+        Id INT,
+        WholeSlideImageId INT,
+        ImageId INT,
+        [Order] INT,
+        Label NVARCHAR(255),
+        Description NVARCHAR(1000),
+        PinXCoordinate DECIMAL(22,19),
+        PinYCoordinate DECIMAL(22,19),
+        Colour INT
+    );
+
+    INSERT INTO @WsiaResult
+    SELECT ia.Id, ia.WholeSlideImageId, ia.ImageId, ia.[Order], ia.Label, ia.Description, ia.PinXCoordinate, ia.PinYCoordinate, ia.Colour
+    FROM resources.ImageAnnotation ia
+    INNER JOIN @WsiResult wsi ON ia.WholeSlideImageId = wsi.Id
+    WHERE ia.Deleted = 0;
+
+    SELECT * FROM @WsiaResult;
+
+    -- WholeSlide Image Annotation Mark
+    SELECT iam.*
+    FROM resources.ImageAnnotationMark iam
+    INNER JOIN @WsiaResult wsia ON iam.ImageAnnotationId = wsia.Id
+    WHERE iam.Deleted = 0;
+
+    -- Media Block
+    DECLARE @MediaBlockResult TABLE (
+        Id INT,
+        BlockId INT,
+        MediaType INT,
+        AttachmentId INT,
+        ImageId INT,
+        VideoId INT
+    );
+
+    INSERT INTO @MediaBlockResult
+    SELECT mb.Id, mb.BlockId, mb.MediaType, mb.AttachmentId, mb.ImageId, mb.VideoId
+    FROM resources.MediaBlock mb
+    INNER JOIN @BlockResult b ON mb.BlockId = b.Id
+    WHERE mb.Deleted = 0;
+
+    SELECT * FROM @MediaBlockResult;
+
+    -- Attachment
+    DECLARE @AttachmentResult TABLE (
+        Id INT,
+        FileId INT
+    );
+
+    INSERT INTO @AttachmentResult
+    SELECT a.Id, a.FileId
+    FROM resources.Attachment a
+    INNER JOIN @MediaBlockResult mb ON a.Id = mb.AttachmentId
+    WHERE a.Deleted = 0;
+
+    SELECT * FROM @AttachmentResult;
+
+    -- Attachment File
+    DECLARE @AttachmentFileResult TABLE (
+        Id INT,
+        FileTypeId INT,
+        FileChunkDetailId INT,
+        [FileName] NVARCHAR(255),
+        FilePath NVARCHAR(1024),
+        FileSizekb INT
+    );
+
+    INSERT INTO @AttachmentFileResult
+    SELECT f.Id, f.FileTypeId, f.FileChunkDetailId, f.[FileName], f.FilePath, f.FileSizeKb
+    FROM resources.[File] f
+    INNER JOIN @AttachmentResult ar ON f.Id = ar.FileId
+    WHERE f.Deleted = 0;
+
+    SELECT * FROM @AttachmentFileResult;
+
+    -- Attachment File - Partial File
+    SELECT pf.*
+    FROM resources.PartialFile pf
+    INNER JOIN @AttachmentFileResult af ON pf.FileId = af.Id
+    WHERE pf.Deleted = 0;
+
+    -- Image
+    DECLARE @ImageResult TABLE (
+        Id INT,
+        FileId INT,
+        AltText NVARCHAR(125),
+        Description NVARCHAR(250)
+    );
+
+    INSERT INTO @ImageResult
+    SELECT i.Id, i.FileId, i.AltText, i.Description
+    FROM resources.Image i
+    INNER JOIN @MediaBlockResult mb ON i.Id = mb.ImageId
+    WHERE i.Deleted = 0;
+
+    SELECT * FROM @ImageResult;
+
+    -- Image File
+    DECLARE @ImageFileResult TABLE (
+        Id INT,
+        FileTypeId INT,
+        FileChunkDetailId INT,
+        [FileName] NVARCHAR(255),
+        FilePath NVARCHAR(1024),
+        FileSizekb INT
+    );
+
+    INSERT INTO @ImageFileResult
+    SELECT f.Id, f.FileTypeId, f.FileChunkDetailId, f.[FileName], f.FilePath, f.FileSizeKb
+    FROM resources.[File] f
+    INNER JOIN @ImageResult ir ON f.Id = ir.FileId
+    WHERE f.Deleted = 0;
+
+    SELECT * FROM @ImageFileResult;
+
+    -- Image File - Partial File
+    SELECT pf.*
+    FROM resources.PartialFile pf
+    INNER JOIN @ImageFileResult ifr ON pf.FileId = ifr.Id
+    WHERE pf.Deleted = 0;
+
+    -- Video
+    DECLARE @VideoResult TABLE (
+        Id INT,
+        FileId INT
+    );
+
+    INSERT INTO @VideoResult
+    SELECT v.Id, v.FileId
+    FROM resources.Video v
+    INNER JOIN @MediaBlockResult mb ON v.Id = mb.VideoId
+    WHERE v.Deleted = 0;
+
+    SELECT * FROM @VideoResult;
+
+    -- Video File
+    DECLARE @VideoFileResult TABLE (
+        Id INT,
+        FileTypeId INT,
+        FileChunkDetailId INT,
+        [FileName] NVARCHAR(255),
+        FilePath NVARCHAR(1024),
+        FileSizekb INT
+    );
+
+    INSERT INTO @VideoFileResult
+    SELECT f.Id, f.FileTypeId, f.FileChunkDetailId, f.[FileName], f.FilePath, f.FileSizeKb
+    FROM resources.[File] f
+    INNER JOIN @VideoResult vr ON f.Id = vr.FileId
+    WHERE f.Deleted = 0;
+
+    SELECT * FROM @VideoFileResult;
+
+    -- Video File - Partial File
+    SELECT pf.*
+    FROM resources.PartialFile pf
+    INNER JOIN @VideoFileResult vf ON pf.FileId = vf.Id
+    WHERE pf.Deleted = 0;
+
+    -- Video File Detail
+    SELECT vf.*
+    FROM resources.VideoFile vf
+    INNER JOIN @VideoFileResult vfr ON vf.FileId = vfr.Id
+    WHERE vf.Deleted = 0;
+
+    -- Question Block
+    DECLARE @QuestionResult TABLE (
+        Id INT,
+        BlockId INT,
+        QuestionBlockCollectionId INT,
+        FeedbackBlockCollectionId INT,
+        QuestionType INT,
+        AllowReveal BIT
+    );
+
+    INSERT INTO @QuestionResult
+    SELECT qb.Id, qb.BlockId, qb.QuestionBlockCollectionId, qb.FeedbackBlockCollectionId, qb.QuestionType, qb.AllowReveal
+    FROM resources.QuestionBlock qb
+    INNER JOIN @BlockResult b ON qb.BlockId = b.Id
+    WHERE qb.Deleted = 0;
+
+    SELECT * FROM @QuestionResult;
+
+    -- Question Answer
+    SELECT qa.*
+    FROM resources.QuestionAnswer qa
+    INNER JOIN @QuestionResult qr ON qa.QuestionBlockId = qr.Id
+    WHERE qa.Deleted = 0;
+
+    -- Image Carousel Block
+    SELECT icb.*
+    FROM resources.ImageCarouselBlock icb
+    INNER JOIN @BlockResult b ON icb.BlockId = b.Id
+    WHERE icb.Deleted = 0;
+END
+GO
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/CaseBlockCollectionGetAll.sql b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/CaseBlockCollectionGetAll.sql
new file mode 100644
index 000000000..710829583
--- /dev/null
+++ b/WebAPI/LearningHub.Nhs.Database/Stored Procedures/Resources/CaseBlockCollectionGetAll.sql	
@@ -0,0 +1,339 @@
+-------------------------------------------------------------------------------
+-- Author       Tobi Awe
+-- Created      30-05-2024
+-- Purpose      Get all case content block collections of all undeleted resource version including published(current version only) versions while excluding the version being edited. 
+--
+-- Modification History
+--
+-- 30-05-2024  TD-3023	Initial Revision
+-------------------------------------------------------------------------------
+CREATE PROCEDURE [resources].[CaseBlockCollectionGetAll] (
+    @excludeResourceVersionId INT
+)
+AS
+BEGIN
+    -- Table to hold BlockCollectionIds
+    DECLARE @BlockCollectionId TABLE (Id INT);
+
+    -- Insert BlockCollectionIds based on the provided query
+    INSERT INTO @BlockCollectionId (Id)
+    SELECT DISTINCT [c].[BlockCollectionId]
+    FROM [resources].[CaseResourceVersion] AS [c]
+    INNER JOIN (
+        SELECT [r].[Id], [r].[ResourceId], [r].[VersionStatusId]
+        FROM [resources].[ResourceVersion] AS [r]
+        WHERE [r].[Deleted] = CAST(0 AS bit)
+    ) AS [t] ON [c].[ResourceVersionId] = [t].[Id]
+    INNER JOIN (
+        SELECT [r0].[Id], [r0].[CurrentResourceVersionId]
+        FROM [resources].[Resource] AS [r0]
+        WHERE [r0].[Deleted] = CAST(0 AS bit)
+    ) AS [t0] ON [t].[ResourceId] = [t0].[Id]
+    WHERE ([c].[Deleted] = CAST(0 AS bit)) 
+      AND ((([c].[ResourceVersionId] <> @excludeResourceVersionId) 
+            AND ([c].[Deleted] = CAST(0 AS bit))) 
+           AND (([t].[VersionStatusId] <> 2) 
+                OR (([t].[VersionStatusId] = 2) 
+                    AND ([t0].[CurrentResourceVersionId] = [c].[ResourceVersionId])))) 
+      AND [c].[BlockCollectionId] IS NOT NULL;
+
+    -- Table to hold results for blocks
+    DECLARE @BlockResult TABLE (
+        Id INT,
+        [Order] INT,
+        Title NVARCHAR(200),
+        BlockType INT,
+        BlockCollectionId INT
+    );
+
+    -- Insert block data
+    INSERT INTO @BlockResult
+    SELECT Id, [Order], Title, BlockType, BlockCollectionId
+    FROM resources.Block
+    WHERE Deleted = 0 AND BlockCollectionId IN (SELECT Id FROM @BlockCollectionId);
+
+    -- Select block data
+    SELECT br.Id, [Order], Title, BlockType, BlockCollectionId
+    FROM @BlockResult br
+    JOIN @BlockCollectionId bc ON br.BlockCollectionId = bc.Id;
+
+    -- Select text block data
+    SELECT t.*
+    FROM resources.TextBlock t
+    INNER JOIN @BlockResult b ON b.Id = t.BlockId
+    WHERE t.Deleted = 0;
+
+    -- WholeSlide Image Block
+    DECLARE @WsibResult TABLE (
+        Id INT,
+        BlockId INT
+    );
+
+    INSERT INTO @WsibResult
+    SELECT w.Id, w.BlockId
+    FROM resources.WholeSlideImageBlock w
+    INNER JOIN @BlockResult b ON b.Id = w.BlockId
+    WHERE w.Deleted = 0;
+
+    SELECT * FROM @WsibResult;
+
+    -- WholeSlide Image Block Items
+    DECLARE @WsibiResult TABLE (
+        Id INT,
+        WholeSlideImageBlockId INT,
+        WholeSlideImageId INT,
+        PlaceholderText NVARCHAR(255),
+        [Order] INT
+    );
+
+    INSERT INTO @WsibiResult
+    SELECT wi.Id, wi.WholeSlideImageBlockId, wi.WholeSlideImageId, wi.PlaceholderText, wi.[Order]
+    FROM resources.WholeSlideImageBlockItem wi
+    INNER JOIN @WsibResult w ON wi.WholeSlideImageBlockId = w.Id
+    WHERE wi.Deleted = 0;
+
+    SELECT * FROM @WsibiResult;
+
+    -- WholeSlide Image
+    DECLARE @WsiResult TABLE (
+        Id INT,
+        Title NVARCHAR(1000),
+        FileId INT
+    );
+
+    INSERT INTO @WsiResult
+    SELECT wsi.Id, wsi.Title, wsi.FileId
+    FROM resources.WholeSlideImage wsi
+    INNER JOIN @WsibiResult wi ON wsi.Id = wi.WholeSlideImageId
+    WHERE wsi.Deleted = 0;
+
+    SELECT * FROM @WsiResult;
+
+    -- WholeSlide Image File
+    DECLARE @WsiFileResult TABLE (
+        Id INT,
+        FileTypeId INT,
+        FileChunkDetailId INT,
+        [FileName] NVARCHAR(255),
+        FilePath NVARCHAR(1024),
+        FileSizekb INT
+    );
+
+    INSERT INTO @WsiFileResult
+    SELECT f.Id, f.FileTypeId, f.FileChunkDetailId, f.[FileName], f.FilePath, f.FileSizeKb
+    FROM resources.[File] f
+    INNER JOIN @WsiResult wsi ON f.Id = wsi.FileId
+    WHERE f.Deleted = 0;
+
+    SELECT * FROM @WsiFileResult;
+
+    -- WholeSlide Image File - Partial File
+    SELECT pf.*
+    FROM resources.PartialFile pf
+    INNER JOIN @WsiFileResult wsi ON pf.FileId = wsi.Id
+    WHERE pf.Deleted = 0;
+
+    -- WholeSlide Image File - Image File
+    SELECT wsif.*
+    FROM resources.WholeSlideImageFile wsif
+    INNER JOIN @WsiFileResult wsi ON wsif.FileId = wsi.Id
+    WHERE wsif.Deleted = 0;
+
+    -- WholeSlide Image Annotation
+    DECLARE @WsiaResult TABLE (
+        Id INT,
+        WholeSlideImageId INT,
+        ImageId INT,
+        [Order] INT,
+        Label NVARCHAR(255),
+        Description NVARCHAR(1000),
+        PinXCoordinate DECIMAL(22,19),
+        PinYCoordinate DECIMAL(22,19),
+        Colour INT
+    );
+
+    INSERT INTO @WsiaResult
+    SELECT ia.Id, ia.WholeSlideImageId, ia.ImageId, ia.[Order], ia.Label, ia.Description, ia.PinXCoordinate, ia.PinYCoordinate, ia.Colour
+    FROM resources.ImageAnnotation ia
+    INNER JOIN @WsiResult wsi ON ia.WholeSlideImageId = wsi.Id
+    WHERE ia.Deleted = 0;
+
+    SELECT * FROM @WsiaResult;
+
+    -- WholeSlide Image Annotation Mark
+    SELECT iam.*
+    FROM resources.ImageAnnotationMark iam
+    INNER JOIN @WsiaResult wsia ON iam.ImageAnnotationId = wsia.Id
+    WHERE iam.Deleted = 0;
+
+    -- Media Block
+    DECLARE @MediaBlockResult TABLE (
+        Id INT,
+        BlockId INT,
+        MediaType INT,
+        AttachmentId INT,
+        ImageId INT,
+        VideoId INT
+    );
+
+    INSERT INTO @MediaBlockResult
+    SELECT mb.Id, mb.BlockId, mb.MediaType, mb.AttachmentId, mb.ImageId, mb.VideoId
+    FROM resources.MediaBlock mb
+    INNER JOIN @BlockResult b ON mb.BlockId = b.Id
+    WHERE mb.Deleted = 0;
+
+    SELECT * FROM @MediaBlockResult;
+
+    -- Attachment
+    DECLARE @AttachmentResult TABLE (
+        Id INT,
+        FileId INT
+    );
+
+    INSERT INTO @AttachmentResult
+    SELECT a.Id, a.FileId
+    FROM resources.Attachment a
+    INNER JOIN @MediaBlockResult mb ON a.Id = mb.AttachmentId
+    WHERE a.Deleted = 0;
+
+    SELECT * FROM @AttachmentResult;
+
+    -- Attachment File
+    DECLARE @AttachmentFileResult TABLE (
+        Id INT,
+        FileTypeId INT,
+        FileChunkDetailId INT,
+        [FileName] NVARCHAR(255),
+        FilePath NVARCHAR(1024),
+        FileSizekb INT
+    );
+
+    INSERT INTO @AttachmentFileResult
+    SELECT f.Id, f.FileTypeId, f.FileChunkDetailId, f.[FileName], f.FilePath, f.FileSizeKb
+    FROM resources.[File] f
+    INNER JOIN @AttachmentResult ar ON f.Id = ar.FileId
+    WHERE f.Deleted = 0;
+
+    SELECT * FROM @AttachmentFileResult;
+
+    -- Attachment File - Partial File
+    SELECT pf.*
+    FROM resources.PartialFile pf
+    INNER JOIN @AttachmentFileResult af ON pf.FileId = af.Id
+    WHERE pf.Deleted = 0;
+
+    -- Image
+    DECLARE @ImageResult TABLE (
+        Id INT,
+        FileId INT,
+        AltText NVARCHAR(125),
+        Description NVARCHAR(250)
+    );
+
+    INSERT INTO @ImageResult
+    SELECT i.Id, i.FileId, i.AltText, i.Description
+    FROM resources.Image i
+    INNER JOIN @MediaBlockResult mb ON i.Id = mb.ImageId
+    WHERE i.Deleted = 0;
+
+    SELECT * FROM @ImageResult;
+
+    -- Image File
+    DECLARE @ImageFileResult TABLE (
+        Id INT,
+        FileTypeId INT,
+        FileChunkDetailId INT,
+        [FileName] NVARCHAR(255),
+        FilePath NVARCHAR(1024),
+        FileSizekb INT
+    );
+
+    INSERT INTO @ImageFileResult
+    SELECT f.Id, f.FileTypeId, f.FileChunkDetailId, f.[FileName], f.FilePath, f.FileSizeKb
+    FROM resources.[File] f
+    INNER JOIN @ImageResult ir ON f.Id = ir.FileId
+    WHERE f.Deleted = 0;
+
+    SELECT * FROM @ImageFileResult;
+
+    -- Image File - Partial File
+    SELECT pf.*
+    FROM resources.PartialFile pf
+    INNER JOIN @ImageFileResult ifr ON pf.FileId = ifr.Id
+    WHERE pf.Deleted = 0;
+
+    -- Video
+    DECLARE @VideoResult TABLE (
+        Id INT,
+        FileId INT
+    );
+
+    INSERT INTO @VideoResult
+    SELECT v.Id, v.FileId
+    FROM resources.Video v
+    INNER JOIN @MediaBlockResult mb ON v.Id = mb.VideoId
+    WHERE v.Deleted = 0;
+
+    SELECT * FROM @VideoResult;
+
+    -- Video File
+    DECLARE @VideoFileResult TABLE (
+        Id INT,
+        FileTypeId INT,
+        FileChunkDetailId INT,
+        [FileName] NVARCHAR(255),
+        FilePath NVARCHAR(1024),
+        FileSizekb INT
+    );
+
+    INSERT INTO @VideoFileResult
+    SELECT f.Id, f.FileTypeId, f.FileChunkDetailId, f.[FileName], f.FilePath, f.FileSizeKb
+    FROM resources.[File] f
+    INNER JOIN @VideoResult vr ON f.Id = vr.FileId
+    WHERE f.Deleted = 0;
+
+    SELECT * FROM @VideoFileResult;
+
+    -- Video File - Partial File
+    SELECT pf.*
+    FROM resources.PartialFile pf
+    INNER JOIN @VideoFileResult vf ON pf.FileId = vf.Id
+    WHERE pf.Deleted = 0;
+
+    -- Video File Detail
+    SELECT vf.*
+    FROM resources.VideoFile vf
+    INNER JOIN @VideoFileResult vfr ON vf.FileId = vfr.Id
+    WHERE vf.Deleted = 0;
+
+    -- Question Block
+    DECLARE @QuestionResult TABLE (
+        Id INT,
+        BlockId INT,
+        QuestionBlockCollectionId INT,
+        FeedbackBlockCollectionId INT,
+        QuestionType INT,
+        AllowReveal BIT
+    );
+
+    INSERT INTO @QuestionResult
+    SELECT qb.Id, qb.BlockId, qb.QuestionBlockCollectionId, qb.FeedbackBlockCollectionId, qb.QuestionType, qb.AllowReveal
+    FROM resources.QuestionBlock qb
+    INNER JOIN @BlockResult b ON qb.BlockId = b.Id
+    WHERE qb.Deleted = 0;
+
+    SELECT * FROM @QuestionResult;
+
+    -- Question Answer
+    SELECT qa.*
+    FROM resources.QuestionAnswer qa
+    INNER JOIN @QuestionResult qr ON qa.QuestionBlockId = qr.Id
+    WHERE qa.Deleted = 0;
+
+    -- Image Carousel Block
+    SELECT icb.*
+    FROM resources.ImageCarouselBlock icb
+    INNER JOIN @BlockResult b ON icb.BlockId = b.Id
+    WHERE icb.Deleted = 0;
+END
+GO
\ No newline at end of file
diff --git a/WebAPI/LearningHub.Nhs.Repository.Interface/Resources/IBlockCollectionRepository.cs b/WebAPI/LearningHub.Nhs.Repository.Interface/Resources/IBlockCollectionRepository.cs
index 0a1a52618..e24e35540 100644
--- a/WebAPI/LearningHub.Nhs.Repository.Interface/Resources/IBlockCollectionRepository.cs
+++ b/WebAPI/LearningHub.Nhs.Repository.Interface/Resources/IBlockCollectionRepository.cs
@@ -1,8 +1,10 @@
 namespace LearningHub.Nhs.Repository.Interface.Resources
 {
+    using System;
     using System.Collections.Generic;
     using System.Threading.Tasks;
     using LearningHub.Nhs.Models.Entities.Resource.Blocks;
+    using LearningHub.Nhs.Models.Enums;
 
     /// <summary>
     /// The BlockRepository interface.
@@ -30,5 +32,13 @@ public interface IBlockCollectionRepository : IGenericRepository<BlockCollection
         /// <param name="blockCollectionId">The Block Collection Id.</param>
         /// <returns>The <see cref="Task"/>.</returns>
         Task<List<Block>> GetQuestionBlocks(int blockCollectionId);
+
+        /// <summary>
+        /// Gets the Case, AssessmentContent, AssessmentGuidance Block Collections (including child Blocks, TextBlocks, WholeSlideImageBlocks and Files) except that of the provided resource version.
+        /// </summary>
+        /// <param name="excludeResourceVersionId">The excluded ResourceVersion Id.</param>
+        /// <param name="resourceTypeEnum">The resource type.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task<Tuple<BlockCollection, BlockCollection, BlockCollection>> GetAllBlockCollections(int excludeResourceVersionId, ResourceTypeEnum resourceTypeEnum);
     }
 }
diff --git a/WebAPI/LearningHub.Nhs.Repository/Resources/BlockCollectionRepository.cs b/WebAPI/LearningHub.Nhs.Repository/Resources/BlockCollectionRepository.cs
index be2bc4f98..0f027f426 100644
--- a/WebAPI/LearningHub.Nhs.Repository/Resources/BlockCollectionRepository.cs
+++ b/WebAPI/LearningHub.Nhs.Repository/Resources/BlockCollectionRepository.cs
@@ -166,6 +166,37 @@ await Task.WhenAll(blockCollection.Blocks
             return blockCollection;
         }
 
+        /// <summary>
+        /// Gets the Case, AssessmentContent, AssessmentGuidance Block Collections (including child Blocks, TextBlocks, WholeSlideImageBlocks and Files) except that of the provided resource version.
+        /// </summary>
+        /// <param name="excludeResourceVersionId">The excluded ResourceVersion Id.</param>
+        /// <param name="resourceTypeEnum">The resource type.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        public async Task<Tuple<BlockCollection, BlockCollection, BlockCollection>> GetAllBlockCollections(int excludeResourceVersionId, ResourceTypeEnum resourceTypeEnum)
+        {
+            if (resourceTypeEnum == ResourceTypeEnum.Case)
+            {
+                var caseContent = await this.GetAllCaseBlockCollections(excludeResourceVersionId);
+                return new Tuple<BlockCollection, BlockCollection, BlockCollection>(caseContent, null, null);
+            }
+            else if (resourceTypeEnum == ResourceTypeEnum.Assessment)
+            {
+                var assessmentContentTask = this.GetAllAssessmentContentBlockCollections(excludeResourceVersionId);
+                var assessmentGuidanceTask = this.GetAllAssessmentGuidanceBlockCollections(excludeResourceVersionId);
+
+                await Task.WhenAll(assessmentContentTask, assessmentGuidanceTask);
+
+                return new Tuple<BlockCollection, BlockCollection, BlockCollection>(
+                    null,
+                    await assessmentContentTask,
+                    await assessmentGuidanceTask);
+            }
+            else
+            {
+                return new Tuple<BlockCollection, BlockCollection, BlockCollection>(null, null, null);
+            }
+        }
+
         /// <summary>
         /// Gets the Question blocks for a particular blockCollectionId.
         /// </summary>
@@ -416,5 +447,209 @@ private void SetAuditFieldsOnChildren(int userId, ImageCarouselBlock imageCarous
             this.SetAuditFieldsForCreateOrDelete(userId, imageCarouselBlock.ImageBlockCollection, isCreate);
             this.SetAuditFieldsOnChildren(userId, imageCarouselBlock.ImageBlockCollection, isCreate);
         }
+
+        private async Task<BlockCollection> GetAllCaseBlockCollections(int excludeResourceVersionId)
+        {
+            var command = new SqlCommand
+            {
+                CommandType = CommandType.StoredProcedure,
+                CommandText = "[resources].[CaseBlockCollectionGetAll]",
+                Parameters = { new SqlParameter("@excludeResourceVersionId", SqlDbType.Int) { Value = excludeResourceVersionId } },
+            };
+
+            var results = this.DbContext.MultipleResults(command)
+                            .With<Block>()
+                            .With<TextBlock>()
+                            .With<WholeSlideImageBlock>()
+                            .With<WholeSlideImageBlockItem>()
+                            .With<WholeSlideImage>()
+                            .With<File>()
+                            .With<PartialFile>()
+                            .With<WholeSlideImageFile>()
+                            .With<ImageAnnotation>()
+                            .With<ImageAnnotationMark>()
+                            .With<MediaBlock>()
+                            .With<Attachment>()
+                            .With<File>()
+                            .With<PartialFile>()
+                            .With<Image>()
+                            .With<File>()
+                            .With<PartialFile>()
+                            .With<Video>()
+                            .With<File>()
+                            .With<PartialFile>()
+                            .With<VideoFile>()
+                            .With<QuestionBlock>()
+                            .With<QuestionAnswer>()
+                            .With<ImageCarouselBlock>()
+                            .Execute();
+
+            var blocks = results[0].OfType<Block>().ToArray();
+            var textBlocks = results[1].OfType<TextBlock>();
+            var wholeSlideImgBlocks = GetWholeSlideImageBlocks(results);
+            var mediaBlocks = GetMediaBlocks(results);
+            var questionBlocks = GetQuestionBlocks(results);
+            var imgCarouselBlocks = results[23].OfType<ImageCarouselBlock>();
+
+            foreach (var block in blocks)
+            {
+                block.TextBlock = textBlocks.FirstOrDefault(t => t.BlockId == block.Id);
+                block.WholeSlideImageBlock = wholeSlideImgBlocks.FirstOrDefault(w => w.BlockId == block.Id);
+                block.MediaBlock = mediaBlocks.FirstOrDefault(m => m.BlockId == block.Id);
+                block.QuestionBlock = questionBlocks.FirstOrDefault(q => q.BlockId == block.Id);
+                block.ImageCarouselBlock = imgCarouselBlocks.FirstOrDefault(i => i.BlockId == block.Id);
+            }
+
+            var blockCollection = new BlockCollection
+            {
+                Blocks = blocks,
+            };
+
+            await Task.WhenAll(blockCollection.Blocks
+                .Where(block => block.QuestionBlock != null)
+                .Select(block => this.FillInPartialQuestionBlock(block.QuestionBlock)));
+
+            await Task.WhenAll(blockCollection.Blocks
+                .Where(block => block.ImageCarouselBlock != null)
+                .Select(block => this.FillInPartialImageCarouselBlock(block.ImageCarouselBlock)));
+
+            return blockCollection;
+        }
+
+        private async Task<BlockCollection> GetAllAssessmentContentBlockCollections(int excludeResourceVersionId)
+        {
+            var command = new SqlCommand
+            {
+                CommandType = CommandType.StoredProcedure,
+                CommandText = "[resources].[AssessmentContentBlockCollectionGetAll]",
+                Parameters = { new SqlParameter("@excludeResourceVersionId", SqlDbType.Int) { Value = excludeResourceVersionId } },
+            };
+
+            var results = this.DbContext.MultipleResults(command)
+                            .With<Block>()
+                            .With<TextBlock>()
+                            .With<WholeSlideImageBlock>()
+                            .With<WholeSlideImageBlockItem>()
+                            .With<WholeSlideImage>()
+                            .With<File>()
+                            .With<PartialFile>()
+                            .With<WholeSlideImageFile>()
+                            .With<ImageAnnotation>()
+                            .With<ImageAnnotationMark>()
+                            .With<MediaBlock>()
+                            .With<Attachment>()
+                            .With<File>()
+                            .With<PartialFile>()
+                            .With<Image>()
+                            .With<File>()
+                            .With<PartialFile>()
+                            .With<Video>()
+                            .With<File>()
+                            .With<PartialFile>()
+                            .With<VideoFile>()
+                            .With<QuestionBlock>()
+                            .With<QuestionAnswer>()
+                            .With<ImageCarouselBlock>()
+                            .Execute();
+
+            var blocks = results[0].OfType<Block>().ToArray();
+            var textBlocks = results[1].OfType<TextBlock>();
+            var wholeSlideImgBlocks = GetWholeSlideImageBlocks(results);
+            var mediaBlocks = GetMediaBlocks(results);
+            var questionBlocks = GetQuestionBlocks(results);
+            var imgCarouselBlocks = results[23].OfType<ImageCarouselBlock>();
+
+            foreach (var block in blocks)
+            {
+                block.TextBlock = textBlocks.FirstOrDefault(t => t.BlockId == block.Id);
+                block.WholeSlideImageBlock = wholeSlideImgBlocks.FirstOrDefault(w => w.BlockId == block.Id);
+                block.MediaBlock = mediaBlocks.FirstOrDefault(m => m.BlockId == block.Id);
+                block.QuestionBlock = questionBlocks.FirstOrDefault(q => q.BlockId == block.Id);
+                block.ImageCarouselBlock = imgCarouselBlocks.FirstOrDefault(i => i.BlockId == block.Id);
+            }
+
+            var blockCollection = new BlockCollection
+            {
+                Blocks = blocks,
+            };
+
+            await Task.WhenAll(blockCollection.Blocks
+                .Where(block => block.QuestionBlock != null)
+                .Select(block => this.FillInPartialQuestionBlock(block.QuestionBlock)));
+
+            await Task.WhenAll(blockCollection.Blocks
+                .Where(block => block.ImageCarouselBlock != null)
+                .Select(block => this.FillInPartialImageCarouselBlock(block.ImageCarouselBlock)));
+
+            return blockCollection;
+        }
+
+        private async Task<BlockCollection> GetAllAssessmentGuidanceBlockCollections(int excludeResourceVersionId)
+        {
+            var command = new SqlCommand
+            {
+                CommandType = CommandType.StoredProcedure,
+                CommandText = "[resources].[AssessmentGuidanceBlockCollectionGetAll]",
+                Parameters = { new SqlParameter("@excludeResourceVersionId", SqlDbType.Int) { Value = excludeResourceVersionId } },
+            };
+
+            var results = this.DbContext.MultipleResults(command)
+                            .With<Block>()
+                            .With<TextBlock>()
+                            .With<WholeSlideImageBlock>()
+                            .With<WholeSlideImageBlockItem>()
+                            .With<WholeSlideImage>()
+                            .With<File>()
+                            .With<PartialFile>()
+                            .With<WholeSlideImageFile>()
+                            .With<ImageAnnotation>()
+                            .With<ImageAnnotationMark>()
+                            .With<MediaBlock>()
+                            .With<Attachment>()
+                            .With<File>()
+                            .With<PartialFile>()
+                            .With<Image>()
+                            .With<File>()
+                            .With<PartialFile>()
+                            .With<Video>()
+                            .With<File>()
+                            .With<PartialFile>()
+                            .With<VideoFile>()
+                            .With<QuestionBlock>()
+                            .With<QuestionAnswer>()
+                            .With<ImageCarouselBlock>()
+                            .Execute();
+
+            var blocks = results[0].OfType<Block>().ToArray();
+            var textBlocks = results[1].OfType<TextBlock>();
+            var wholeSlideImgBlocks = GetWholeSlideImageBlocks(results);
+            var mediaBlocks = GetMediaBlocks(results);
+            var questionBlocks = GetQuestionBlocks(results);
+            var imgCarouselBlocks = results[23].OfType<ImageCarouselBlock>();
+
+            foreach (var block in blocks)
+            {
+                block.TextBlock = textBlocks.FirstOrDefault(t => t.BlockId == block.Id);
+                block.WholeSlideImageBlock = wholeSlideImgBlocks.FirstOrDefault(w => w.BlockId == block.Id);
+                block.MediaBlock = mediaBlocks.FirstOrDefault(m => m.BlockId == block.Id);
+                block.QuestionBlock = questionBlocks.FirstOrDefault(q => q.BlockId == block.Id);
+                block.ImageCarouselBlock = imgCarouselBlocks.FirstOrDefault(i => i.BlockId == block.Id);
+            }
+
+            var blockCollection = new BlockCollection
+            {
+                Blocks = blocks,
+            };
+
+            await Task.WhenAll(blockCollection.Blocks
+                .Where(block => block.QuestionBlock != null)
+                .Select(block => this.FillInPartialQuestionBlock(block.QuestionBlock)));
+
+            await Task.WhenAll(blockCollection.Blocks
+                .Where(block => block.ImageCarouselBlock != null)
+                .Select(block => this.FillInPartialImageCarouselBlock(block.ImageCarouselBlock)));
+
+            return blockCollection;
+        }
     }
 }
diff --git a/WebAPI/LearningHub.Nhs.Services.Interface/IResourceService.cs b/WebAPI/LearningHub.Nhs.Services.Interface/IResourceService.cs
index 511aa8500..c45307565 100644
--- a/WebAPI/LearningHub.Nhs.Services.Interface/IResourceService.cs
+++ b/WebAPI/LearningHub.Nhs.Services.Interface/IResourceService.cs
@@ -5,11 +5,13 @@ namespace LearningHub.Nhs.Services.Interface
     using System.Threading.Tasks;
     using LearningHub.Nhs.Models.Common;
     using LearningHub.Nhs.Models.Entities.Resource;
+    using LearningHub.Nhs.Models.Enums;
     using LearningHub.Nhs.Models.Paging;
     using LearningHub.Nhs.Models.Provider;
     using LearningHub.Nhs.Models.Resource;
     using LearningHub.Nhs.Models.Resource.Admin;
     using LearningHub.Nhs.Models.Resource.AzureMediaAsset;
+    using LearningHub.Nhs.Models.Resource.Blocks;
     using LearningHub.Nhs.Models.Resource.Contribute;
     using LearningHub.Nhs.Models.Resource.ResourceDisplay;
     using LearningHub.Nhs.Models.Validation;
@@ -436,6 +438,14 @@ public interface IResourceService
         /// <returns>The <see cref="Task"/>.</returns>
         Task<CaseViewModel> GetCaseDetailsByIdAsync(int resourceVersionId);
 
+        /// <summary>
+        /// The get case resource version async.
+        /// </summary>
+        /// <param name="excludeResourceVersionId">The resource version id.</param>
+        /// <param name="resourceType">The resource type.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task<BlockCollectionViewModel> GetAllCaseBlockCollectionsAsync(int excludeResourceVersionId, ResourceTypeEnum resourceType);
+
         /// <summary>
         /// The update case resource version async.
         /// </summary>
@@ -459,6 +469,14 @@ public interface IResourceService
         /// <returns>The <see cref="Task"/>.</returns>
         Task<AssessmentResourceVersion> GetAssessmentBasicDetailsByIdAsync(int resourceVersionId);
 
+        /// <summary>
+        /// The assessment blocks for all published(current) and non published resource version async.
+        /// </summary>
+        /// <param name="excludeResourceVersionId">The resource version id to exclude.</param>
+        /// <param name="resourceType">The resource type enum.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        Task<Tuple<BlockCollectionViewModel, BlockCollectionViewModel>> GetAssessmentBlockCollectionAsync(int excludeResourceVersionId, ResourceTypeEnum resourceType);
+
         /// <summary>
         /// This method updates the database entry with the assessment details, passed down as a parameter.
         /// </summary>
diff --git a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
index aa83042e0..d28ed51d3 100644
--- a/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
+++ b/WebAPI/LearningHub.Nhs.Services/ResourceService.cs
@@ -9,6 +9,7 @@ namespace LearningHub.Nhs.Services
     using System.Threading.Tasks;
     using AutoMapper;
     using Azure.Storage.Blobs;
+    using Azure.Storage.Blobs.Models;
     using Azure.Storage.Blobs.Specialized;
     using LearningHub.Nhs.Api.Shared.Configuration;
     using LearningHub.Nhs.Entities.Resource;
@@ -1326,288 +1327,294 @@ public async Task<List<ResourceVersionViewModel>> GetResourceVersionsAsync(int r
         public async Task<List<string>> GetObsoleteResourceFile(int resourceVersionId, bool deletedResource = false)
         {
             var retVal = new List<string>();
-            var resource = await this.GetResourceVersionExtendedViewModelAsync(resourceVersionId);
-            var rvs = await this.resourceVersionRepository.GetResourceVersionsAsync(resource.ResourceId);
-            rvs = rvs.Where(x => x.Id != resourceVersionId && x.PublicationId > 0).OrderByDescending(x => x.PublicationId).ToList();
-            var rv = rvs.FirstOrDefault();
-            if (rv != null)
+            var resourceVersion = await this.GetResourceVersionByIdAsync(resourceVersionId);
+            if (resourceVersion != null)
             {
-                var extendedResourceVersion = await this.GetResourceVersionExtendedViewModelAsync(rv.Id);
-                if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Scorm)
+                if (resourceVersion.ResourceType == ResourceTypeEnum.Assessment)
                 {
-                    if (resource.ScormDetails?.ContentFilePath != extendedResourceVersion.ScormDetails.ContentFilePath)
+                    var assessmentDetails = await this.GetAssessmentViewModel(resourceVersionId);
+                    var endGuidanceFiles = new List<string>();
+                    var assessmentContentFiles = new List<string>();
+
+                    var allOtherAssessmentBlocks = await this.GetAssessmentBlockCollectionAsync(resourceVersionId, ResourceTypeEnum.Assessment);
+
+                    if (assessmentDetails is { EndGuidance: { } } && assessmentDetails.EndGuidance.Blocks != null)
                     {
-                        if (!deletedResource)
+                        if (deletedResource)
                         {
-                            retVal.Add(extendedResourceVersion.ScormDetails.ContentFilePath);
+                            endGuidanceFiles = this.CheckBlockFile(allOtherAssessmentBlocks.Item2, assessmentDetails.EndGuidance);
                         }
                         else
                         {
-                            retVal.Add(resource.ScormDetails?.File?.FilePath);
-                        }
-                    }
-                }
-                else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Html)
-                {
-                    if (resource.HtmlDetails?.ContentFilePath != extendedResourceVersion.HtmlDetails.ContentFilePath)
-                    {
-                        if (!deletedResource)
-                        {
-                            retVal.Add(extendedResourceVersion.HtmlDetails.ContentFilePath);
+                            endGuidanceFiles = this.CheckBlockFile(assessmentDetails.EndGuidance, allOtherAssessmentBlocks.Item2);
                         }
-                        else
+
+                        if (endGuidanceFiles.Any())
                         {
-                            retVal.Add(resource.HtmlDetails?.File?.FilePath);
+                            retVal.AddRange(endGuidanceFiles);
                         }
                     }
-                }
-                else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.GenericFile)
-                {
-                    if (resource.GenericFileDetails.File.FilePath != extendedResourceVersion.GenericFileDetails.File.FilePath)
+
+                    if (assessmentDetails is { AssessmentContent: { } } && assessmentDetails.AssessmentContent.Blocks != null)
                     {
-                        if (!deletedResource)
+                        if (deletedResource)
                         {
-                            retVal.Add(extendedResourceVersion.GenericFileDetails.File.FilePath);
+                            assessmentContentFiles = this.CheckBlockFile(allOtherAssessmentBlocks.Item1, assessmentDetails.AssessmentContent);
                         }
                         else
                         {
-                            retVal.Add(resource.GenericFileDetails.File.FilePath);
-                        }
-                    }
-                }
-                else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Image)
-                {
-                    if (resource.ImageDetails.File.FilePath != extendedResourceVersion.ImageDetails.File.FilePath)
-                    {
-                        if (!deletedResource)
-                        {
-                            retVal.Add(extendedResourceVersion.ImageDetails.File.FilePath);
+                            assessmentContentFiles = this.CheckBlockFile(assessmentDetails.AssessmentContent, allOtherAssessmentBlocks.Item1);
                         }
-                        else
+
+                        if (assessmentContentFiles.Any())
                         {
-                            retVal.Add(resource.ImageDetails.File.FilePath);
+                            retVal.AddRange(assessmentContentFiles);
                         }
                     }
                 }
-                else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Audio)
+                else if (resourceVersion.ResourceType == ResourceTypeEnum.Case)
                 {
-                    if (resource.AudioDetails?.File?.FilePath != extendedResourceVersion.AudioDetails.File.FilePath)
-                    {
-                        if (!deletedResource)
-                        {
-                            retVal.Add(extendedResourceVersion.AudioDetails.File.FilePath);
-                        }
-                        else
-                        {
-                            retVal.Add(resource.AudioDetails.File.FilePath);
-                        }
-                    }
-
-                    if (resource.AudioDetails?.ResourceAzureMediaAsset?.FilePath != extendedResourceVersion.AudioDetails.ResourceAzureMediaAsset.FilePath)
+                    var caseDetails = await this.GetCaseDetailsByIdAsync(resourceVersionId);
+                    var caseFiles = new List<string>();
+                    var allBlocks = await this.GetAllCaseBlockCollectionsAsync(resourceVersionId, ResourceTypeEnum.Case);
+                    if (deletedResource)
                     {
-                        if (!deletedResource)
-                        {
-                            retVal.Add(extendedResourceVersion.AudioDetails.ResourceAzureMediaAsset.FilePath);
-                        }
-                        else
-                        {
-                            retVal.Add(resource.AudioDetails.ResourceAzureMediaAsset.FilePath);
-                        }
+                        caseFiles = this.CheckBlockFile(allBlocks, caseDetails.BlockCollection);
                     }
-                }
-                else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Video)
-                {
-                    if (resource.VideoDetails?.File?.FilePath != extendedResourceVersion.VideoDetails.File.FilePath)
+                    else
                     {
-                        if (!deletedResource)
-                        {
-                            retVal.Add(extendedResourceVersion.VideoDetails.File.FilePath);
-                        }
-                        else
-                        {
-                            retVal.Add(resource.VideoDetails.File.FilePath);
-                        }
+                        caseFiles = this.CheckBlockFile(caseDetails.BlockCollection, allBlocks);
                     }
 
-                    if (resource.VideoDetails?.ResourceAzureMediaAsset?.FilePath != extendedResourceVersion.VideoDetails.ResourceAzureMediaAsset.FilePath)
+                    if (caseFiles.Any())
                     {
-                        if (!deletedResource)
-                        {
-                            retVal.Add(extendedResourceVersion.VideoDetails.ResourceAzureMediaAsset.FilePath);
-                        }
-                        else
-                        {
-                            retVal.Add(resource.VideoDetails.ResourceAzureMediaAsset.FilePath);
-                        }
+                        retVal.AddRange(caseFiles);
                     }
                 }
-                else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Article)
+                else
                 {
-                    var inputResourceFiles = resource.ArticleDetails.Files.ToList();
-                    var previousPublishedfiles = extendedResourceVersion.ArticleDetails?.Files?.ToList();
-                    if (!deletedResource)
+                    // get latest published resource version
+                    var rvs = await this.resourceVersionRepository.GetResourceVersionsAsync(resourceVersion.ResourceId);
+                    rvs = rvs.Where(x => x.Id != resourceVersionId && x.PublicationId > 0).OrderByDescending(x => x.PublicationId).ToList();
+                    var rv = rvs.FirstOrDefault();
+                    var extendedResourceVersion = await this.GetResourceVersionExtendedViewModelAsync(rv.Id);
+                    switch (resourceVersion.ResourceType)
                     {
-                        if (previousPublishedfiles.Any())
-                        {
-                            foreach (var file in previousPublishedfiles)
+                        case ResourceTypeEnum.Scorm:
+                            var scormResource = await this.GetScormDetailsByIdAsync(resourceVersionId);
+                            if (rv != null)
                             {
-                                if (!inputResourceFiles.Where(x => x.FilePath == file.FilePath).Any())
+                                if (scormResource?.ContentFilePath != extendedResourceVersion.ScormDetails.ContentFilePath)
                                 {
-                                    retVal.Add(file.FilePath);
+                                    if (!deletedResource)
+                                    {
+                                        retVal.Add(extendedResourceVersion.ScormDetails.ContentFilePath);
+                                    }
+                                    else
+                                    {
+                                        retVal.Add(scormResource?.File?.FilePath);
+                                    }
                                 }
                             }
-                        }
-                    }
-                    else
-                    {
-                        if (inputResourceFiles.Any())
-                        {
-                            foreach (var file in inputResourceFiles)
+                            else if (rv == null && deletedResource)
                             {
-                                if (!previousPublishedfiles.Where(x => x.FilePath == file.FilePath).Any())
-                                {
-                                    retVal.Add(file.FilePath);
-                                }
+                                retVal.Add(scormResource.ContentFilePath);
                             }
-                        }
-                    }
-                }
-                else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Assessment)
-                {
-                    var endGuidanceFiles = new List<string>();
-                    var assessmentContentFiles = new List<string>();
 
-                    if (resource.AssessmentDetails is { EndGuidance: { } } && resource.AssessmentDetails.EndGuidance.Blocks != null)
-                        {
-                            if (deletedResource)
+                            break;
+                        case ResourceTypeEnum.Html:
+                            var htmlResource = await this.GetHtmlDetailsByIdAsync(resourceVersionId);
+                            if (rv != null)
                             {
-                                endGuidanceFiles = this.CheckBlockFile(extendedResourceVersion.AssessmentDetails.EndGuidance, resource.AssessmentDetails.EndGuidance);
+                                if (htmlResource?.ContentFilePath != extendedResourceVersion.HtmlDetails.ContentFilePath)
+                                {
+                                    if (!deletedResource)
+                                    {
+                                        retVal.Add(extendedResourceVersion.HtmlDetails.ContentFilePath);
+                                    }
+                                    else
+                                    {
+                                        retVal.Add(htmlResource?.File?.FilePath);
+                                    }
+                                }
                             }
-                            else
+                            else if (rv == null && deletedResource)
                             {
-                                endGuidanceFiles = this.CheckBlockFile(resource.AssessmentDetails.EndGuidance, extendedResourceVersion.AssessmentDetails.EndGuidance);
+                                retVal.Add(htmlResource.ContentFilePath);
                             }
 
-                            if (endGuidanceFiles.Any())
+                            break;
+                        case ResourceTypeEnum.GenericFile:
+                            var fileResource = await this.GetGenericFileDetailsByIdAsync(resourceVersionId);
+                            if (rv != null)
                             {
-                                retVal.AddRange(endGuidanceFiles);
+                                if (fileResource?.File.FilePath != extendedResourceVersion.GenericFileDetails.File.FilePath)
+                                {
+                                    if (!deletedResource)
+                                    {
+                                        retVal.Add(extendedResourceVersion.GenericFileDetails.File.FilePath);
+                                    }
+                                    else
+                                    {
+                                        retVal.Add(fileResource?.File?.FilePath);
+                                    }
+                                }
+                            }
+                            else if (rv == null && deletedResource)
+                            {
+                                retVal.Add(fileResource.File.FilePath);
                             }
-                        }
 
-                    if (resource.AssessmentDetails is { AssessmentContent: { } } && resource.AssessmentDetails.AssessmentContent.Blocks != null)
-                        {
-                            if (deletedResource)
+                            break;
+                        case ResourceTypeEnum.Image:
+                            var imageResource = await this.GetImageDetailsByIdAsync(resourceVersionId);
+                            if (rv != null)
                             {
-                                assessmentContentFiles = this.CheckBlockFile(extendedResourceVersion.AssessmentDetails.AssessmentContent, resource.AssessmentDetails.AssessmentContent);
+                                if (imageResource?.File.FilePath != extendedResourceVersion.ImageDetails.File.FilePath)
+                                {
+                                    if (!deletedResource)
+                                    {
+                                        retVal.Add(extendedResourceVersion.ImageDetails.File.FilePath);
+                                    }
+                                    else
+                                    {
+                                        retVal.Add(imageResource.File.FilePath);
+                                    }
+                                }
                             }
-                            else
+                            else if (rv == null && deletedResource)
                             {
-                                assessmentContentFiles = this.CheckBlockFile(resource.AssessmentDetails.AssessmentContent, extendedResourceVersion.AssessmentDetails.AssessmentContent);
+                                retVal.Add(imageResource.File.FilePath);
                             }
 
-                            if (assessmentContentFiles.Any())
+                            break;
+                        case ResourceTypeEnum.Audio:
+                            var audioResource = await this.GetAudioDetailsByIdAsync(resourceVersionId);
+                            if (rv != null)
                             {
-                                retVal.AddRange(assessmentContentFiles);
+                                if (audioResource?.File?.FilePath != extendedResourceVersion.AudioDetails.File.FilePath)
+                                {
+                                    if (!deletedResource)
+                                    {
+                                        retVal.Add(extendedResourceVersion.AudioDetails.File.FilePath);
+                                    }
+                                    else
+                                    {
+                                        retVal.Add(audioResource.File.FilePath);
+                                    }
+                                }
+
+                                if (audioResource?.ResourceAzureMediaAsset?.FilePath != extendedResourceVersion.AudioDetails.ResourceAzureMediaAsset.FilePath)
+                                {
+                                    if (!deletedResource)
+                                    {
+                                        retVal.Add(extendedResourceVersion.AudioDetails.ResourceAzureMediaAsset.FilePath);
+                                    }
+                                    else
+                                    {
+                                        retVal.Add(audioResource.ResourceAzureMediaAsset.FilePath);
+                                    }
+                                }
+                            }
+                            else if (rv == null && deletedResource)
+                            {
+                                retVal.Add(audioResource?.File?.FilePath);
+                                if (audioResource?.ResourceAzureMediaAsset?.FilePath != null)
+                                {
+                                    retVal.Add(audioResource.ResourceAzureMediaAsset.FilePath);
+                                }
                             }
-                        }
-                }
-                else if (extendedResourceVersion.ResourceTypeEnum == ResourceTypeEnum.Case)
-                {
-                    var caseFiles = new List<string>();
-                    if (deletedResource)
-                    {
-                        caseFiles = this.CheckBlockFile(extendedResourceVersion.CaseDetails.BlockCollection, resource.CaseDetails.BlockCollection);
-                    }
-                    else
-                    {
-                        caseFiles = this.CheckBlockFile(resource.CaseDetails.BlockCollection, extendedResourceVersion.CaseDetails.BlockCollection);
-                    }
 
-                    if (caseFiles.Any())
-                    {
-                        retVal.AddRange(caseFiles);
-                    }
-                }
-            }
-            else if (rv == null && deletedResource)
-            {
-                if (resource.ResourceTypeEnum == ResourceTypeEnum.Scorm)
-                {
-                      retVal.Add(resource.ScormDetails.ContentFilePath);
-                }
-                else if (resource.ResourceTypeEnum == ResourceTypeEnum.Html)
-                {
-                      retVal.Add(resource.HtmlDetails.ContentFilePath);
-                }
-                else if (resource.ResourceTypeEnum == ResourceTypeEnum.GenericFile)
-                {
-                    retVal.Add(resource.GenericFileDetails.File.FilePath);
-                }
-                else if (resource.ResourceTypeEnum == ResourceTypeEnum.Image)
-                {
-                    retVal.Add(resource.ImageDetails.File.FilePath);
-                }
-                else if (resource.ResourceTypeEnum == ResourceTypeEnum.Audio)
-                {
-                    retVal.Add(resource.AudioDetails?.File?.FilePath);
-                    if (resource.AudioDetails?.ResourceAzureMediaAsset?.FilePath != null)
-                    {
-                            retVal.Add(resource.AudioDetails.ResourceAzureMediaAsset.FilePath);
-                    }
-                }
-                else if (resource.ResourceTypeEnum == ResourceTypeEnum.Video)
-                {
-                    retVal.Add(resource.VideoDetails?.File?.FilePath);
-                    if (resource.VideoDetails?.ResourceAzureMediaAsset?.FilePath != null)
-                    {
-                         retVal.Add(resource.VideoDetails.ResourceAzureMediaAsset.FilePath);
-                    }
-                }
-                else if (resource.ResourceTypeEnum == ResourceTypeEnum.Article)
-                {
-                        var inputResourceFiles = resource.ArticleDetails.Files.ToList();
-                        if (inputResourceFiles.Any())
-                        {
-                            foreach (var file in inputResourceFiles)
+                            break;
+                        case ResourceTypeEnum.Video:
+                            var videoResource = await this.GetVideoDetailsByIdAsync(resourceVersionId);
+                            if (rv != null)
                             {
-                                    retVal.Add(file.FilePath);
+                                if (videoResource?.File?.FilePath != extendedResourceVersion.VideoDetails.File.FilePath)
+                                {
+                                    if (!deletedResource)
+                                    {
+                                        retVal.Add(extendedResourceVersion.VideoDetails.File.FilePath);
+                                    }
+                                    else
+                                    {
+                                        retVal.Add(videoResource.File.FilePath);
+                                    }
+                                }
+
+                                if (videoResource?.ResourceAzureMediaAsset?.FilePath != extendedResourceVersion.VideoDetails.ResourceAzureMediaAsset.FilePath)
+                                {
+                                    if (!deletedResource)
+                                    {
+                                        retVal.Add(extendedResourceVersion.VideoDetails.ResourceAzureMediaAsset.FilePath);
+                                    }
+                                    else
+                                    {
+                                        retVal.Add(videoResource.ResourceAzureMediaAsset.FilePath);
+                                    }
+                                }
                             }
-                        }
-                    }
-                else if (resource.ResourceTypeEnum == ResourceTypeEnum.Assessment)
-                {
-                    if (deletedResource)
-                    {
-                        if (resource.AssessmentDetails is { EndGuidance: { } } && resource.AssessmentDetails.EndGuidance.Blocks != null)
-                        {
-                            var assessmentFiles = this.CheckBlockFile(null, resource.AssessmentDetails.EndGuidance);
-                            if (assessmentFiles.Any())
+                            else if (rv == null && deletedResource)
                             {
-                                retVal.AddRange(assessmentFiles);
+                                retVal.Add(videoResource?.File?.FilePath);
+                                if (videoResource?.ResourceAzureMediaAsset?.FilePath != null)
+                                {
+                                    retVal.Add(videoResource.ResourceAzureMediaAsset.FilePath);
+                                }
                             }
-                        }
 
-                        if (resource.AssessmentDetails is { AssessmentContent: { } } && resource.AssessmentDetails.AssessmentContent.Blocks != null)
-                        {
-                            var assessmentFiles = this.CheckBlockFile(null, resource.AssessmentDetails.AssessmentContent);
-                            if (assessmentFiles.Any())
+                            break;
+                        case ResourceTypeEnum.Article:
+                            var articleResource = await this.GetArticleDetailsByIdAsync(resourceVersionId);
+                            if (rv != null)
                             {
-                                retVal.AddRange(assessmentFiles);
+                                var inputResourceFiles = articleResource.Files.ToList();
+                                var previousPublishedfiles = extendedResourceVersion.ArticleDetails?.Files?.ToList();
+                                if (!deletedResource)
+                                {
+                                    if (previousPublishedfiles.Any())
+                                    {
+                                        foreach (var file in previousPublishedfiles)
+                                        {
+                                            if (!inputResourceFiles.Where(x => x.FilePath == file.FilePath).Any())
+                                            {
+                                                retVal.Add(file.FilePath);
+                                            }
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    if (inputResourceFiles.Any())
+                                    {
+                                        foreach (var file in inputResourceFiles)
+                                        {
+                                            if (!previousPublishedfiles.Where(x => x.FilePath == file.FilePath).Any())
+                                            {
+                                                retVal.Add(file.FilePath);
+                                            }
+                                        }
+                                    }
+                                }
                             }
-                        }
-                    }
-                }
-                else if (resource.ResourceTypeEnum == ResourceTypeEnum.Case)
-                {
-                    var caseFiles = this.CheckBlockFile(null, resource.CaseDetails.BlockCollection);
-                    if (caseFiles.Any())
-                    {
-                        retVal.AddRange(caseFiles);
+                            else if (rv == null && deletedResource)
+                            {
+                                var inputResourceFiles = articleResource.Files.ToList();
+                                if (inputResourceFiles.Any())
+                                {
+                                    foreach (var file in inputResourceFiles)
+                                    {
+                                        retVal.Add(file.FilePath);
+                                    }
+                                }
+                            }
+
+                            break;
                     }
                 }
             }
 
-            return retVal;
+            return retVal.Distinct().ToList();
         }
 
         /// <summary>
@@ -2190,6 +2197,28 @@ public async Task<CaseViewModel> GetCaseDetailsByIdAsync(int resourceVersionId)
             return caseViewModel;
         }
 
+        /// <summary>
+        /// The get case resource version async.
+        /// </summary>
+        /// <param name="excludeResourceVersionId">The resource version id.</param>
+        /// <param name="resourceType">The resource type.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        public async Task<BlockCollectionViewModel> GetAllCaseBlockCollectionsAsync(int excludeResourceVersionId, ResourceTypeEnum resourceType)
+        {
+            var blockList = new List<BlockViewModel>();
+            var collection = await this.blockCollectionRepository.GetAllBlockCollections(excludeResourceVersionId, resourceType);
+            if (collection != null && collection.Item1 != null)
+            {
+                var blocks = this.mapper.Map<BlockCollectionViewModel>(collection.Item1);
+                if (blocks.Blocks.Any())
+                {
+                    blockList.AddRange(blocks.Blocks);
+                }
+            }
+
+            return new BlockCollectionViewModel { Blocks = blockList };
+        }
+
         /// <summary>
         /// The update case resource version async.
         /// </summary>
@@ -2272,6 +2301,45 @@ public async Task<AssessmentResourceVersion> GetAssessmentBasicDetailsByIdAsync(
             return assessmentResourceVersion;
         }
 
+        /// <summary>
+        /// The assessment blocks for all published(current) and non published resource version async.
+        /// </summary>
+        /// <param name="excludeResourceVersionId">The resource version id to exclude.</param>
+        /// <param name="resourceType">The resource type enum.</param>
+        /// <returns>The <see cref="Task"/>.</returns>
+        public async Task<Tuple<BlockCollectionViewModel, BlockCollectionViewModel>> GetAssessmentBlockCollectionAsync(int excludeResourceVersionId, ResourceTypeEnum resourceType)
+        {
+            var collection = await this.blockCollectionRepository.GetAllBlockCollections(excludeResourceVersionId, resourceType);
+
+            var assessmentBlocks = new List<BlockViewModel>();
+            var endGuidanceBlocks = new List<BlockViewModel>();
+
+            if (collection != null)
+            {
+                if (collection.Item2 != null)
+                {
+                    var assessmentContentBlocks = this.mapper.Map<BlockCollectionViewModel>(collection.Item2);
+                    if (assessmentContentBlocks.Blocks.Any())
+                    {
+                        assessmentBlocks.AddRange(assessmentContentBlocks.Blocks);
+                    }
+                }
+
+                if (collection.Item3 != null)
+                {
+                    var endGuidanceBlocksView = this.mapper.Map<BlockCollectionViewModel>(collection.Item3);
+                    if (endGuidanceBlocksView.Blocks.Any())
+                    {
+                        endGuidanceBlocks.AddRange(endGuidanceBlocksView.Blocks);
+                    }
+                }
+            }
+
+            return new Tuple<BlockCollectionViewModel, BlockCollectionViewModel>(
+                new BlockCollectionViewModel { Blocks = assessmentBlocks },
+                new BlockCollectionViewModel { Blocks = endGuidanceBlocks });
+        }
+
         /// <summary>
         /// The update assessment resource version async.
         /// </summary>
@@ -4921,7 +4989,7 @@ private List<string> CheckBlockFile(BlockCollectionViewModel? publishedBlock, Bl
                     {
                         foreach (var oldblock in existingAttachements)
                         {
-                            var publishedEntry = (publishedBlock != null && publishedBlock.Blocks.Any()) ? publishedBlock.Blocks.FirstOrDefault(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Attachment && x.MediaBlock.Attachment != null && x.MediaBlock.Attachment.File?.FileId == oldblock.MediaBlock.Attachment?.File?.FileId) : null;
+                            var publishedEntry = (publishedBlock != null && publishedBlock.Blocks.Any()) ? publishedBlock.Blocks.FirstOrDefault(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Attachment && x.MediaBlock.Attachment != null && (x.MediaBlock.Attachment.File?.FilePath == oldblock.MediaBlock.Attachment?.File?.FilePath || x.MediaBlock.Attachment.File?.FileId == oldblock.MediaBlock.Attachment?.File?.FileId)) : null;
                             if (publishedEntry == null)
                             {
                                 retVal.Add(oldblock.MediaBlock.Attachment?.File?.FilePath);
@@ -4934,7 +5002,7 @@ private List<string> CheckBlockFile(BlockCollectionViewModel? publishedBlock, Bl
                     {
                         foreach (var oldblock in existingVideos)
                         {
-                            var publishedEntry = (publishedBlock != null && publishedBlock.Blocks.Any()) ? publishedBlock.Blocks.FirstOrDefault(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Video && x.MediaBlock.Video != null && x.MediaBlock.Video.VideoFile?.File?.FileId == oldblock.MediaBlock?.Video?.VideoFile?.File?.FileId) : null;
+                            var publishedEntry = (publishedBlock != null && publishedBlock.Blocks.Any()) ? publishedBlock.Blocks.FirstOrDefault(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Video && x.MediaBlock.Video != null && (x.MediaBlock.Video.VideoFile?.File?.FilePath == oldblock.MediaBlock?.Video?.VideoFile?.File?.FilePath || x.MediaBlock.Video.VideoFile?.File?.FileId == oldblock.MediaBlock?.Video?.VideoFile?.File?.FileId)) : null;
                             if (publishedEntry == null)
                             {
                                 if (!string.IsNullOrWhiteSpace(oldblock.MediaBlock.Video.File.FilePath))
@@ -4960,7 +5028,7 @@ private List<string> CheckBlockFile(BlockCollectionViewModel? publishedBlock, Bl
                     {
                         foreach (var oldblock in existingImages)
                         {
-                            var publishedEntry = (publishedBlock != null && publishedBlock.Blocks.Any()) ? publishedBlock.Blocks.FirstOrDefault(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Image && x.MediaBlock.Image != null && x.MediaBlock?.Image?.File?.FileId == oldblock.MediaBlock?.Image?.File?.FileId) : null;
+                            var publishedEntry = (publishedBlock != null && publishedBlock.Blocks.Any()) ? publishedBlock.Blocks.FirstOrDefault(x => x.BlockType == BlockType.Media && x.MediaBlock != null && x.MediaBlock.MediaType == MediaType.Image && x.MediaBlock.Image != null && (x.MediaBlock?.Image?.File?.FilePath == oldblock.MediaBlock?.Image?.File?.FilePath || x.MediaBlock?.Image?.File?.FileId == oldblock.MediaBlock?.Image?.File?.FileId)) : null;
                             if (publishedEntry == null)
                             {
                                 retVal.Add(oldblock.MediaBlock?.Image?.File?.FilePath);
@@ -4975,7 +5043,7 @@ private List<string> CheckBlockFile(BlockCollectionViewModel? publishedBlock, Bl
                         {
                             foreach (var oldblock in imageBlock.ImageCarouselBlock.ImageBlockCollection.Blocks)
                             {
-                                var publishedEntry = (publishedBlock != null && publishedBlock.Blocks.Any()) ? publishedBlock.Blocks.FirstOrDefault(x => x.BlockType == BlockType.ImageCarousel && x.ImageCarouselBlock != null && x.ImageCarouselBlock.ImageBlockCollection != null && x.ImageCarouselBlock.ImageBlockCollection.Blocks != null && x.ImageCarouselBlock.ImageBlockCollection.Blocks.Where(x => x.MediaBlock?.Image?.File?.FileId == oldblock.MediaBlock?.Image?.File?.FileId).Any()) : null;
+                                var publishedEntry = (publishedBlock != null && publishedBlock.Blocks.Any()) ? publishedBlock.Blocks.FirstOrDefault(x => x.BlockType == BlockType.ImageCarousel && x.ImageCarouselBlock != null && x.ImageCarouselBlock.ImageBlockCollection != null && x.ImageCarouselBlock.ImageBlockCollection.Blocks != null && x.ImageCarouselBlock.ImageBlockCollection.Blocks.Where(x => x.MediaBlock?.Image?.File?.FilePath == oldblock.MediaBlock?.Image?.File?.FilePath || x.MediaBlock?.Image?.File?.FileId == oldblock.MediaBlock?.Image?.File?.FileId).Any()) : null;
                                 if (publishedEntry == null)
                                 {
                                     retVal.Add(oldblock.MediaBlock?.Image?.File?.FilePath);
@@ -4991,7 +5059,7 @@ private List<string> CheckBlockFile(BlockCollectionViewModel? publishedBlock, Bl
                         {
                             foreach (var oldblock in wsi?.WholeSlideImageBlock?.WholeSlideImageBlockItems)
                             {
-                                var publishedEntry = (publishedBlock != null && publishedBlock.Blocks.Any()) ? publishedBlock.Blocks.FirstOrDefault(x => x.WholeSlideImageBlock != null && x.WholeSlideImageBlock.WholeSlideImageBlockItems.Where(x => x.WholeSlideImage?.File?.FileId == oldblock.WholeSlideImage?.File?.FileId).Any()) : null;
+                                var publishedEntry = (publishedBlock != null && publishedBlock.Blocks.Any()) ? publishedBlock.Blocks.FirstOrDefault(x => x.WholeSlideImageBlock != null && x.WholeSlideImageBlock.WholeSlideImageBlockItems.Where(x => x.WholeSlideImage?.File?.FilePath == oldblock.WholeSlideImage?.File?.FilePath || x.WholeSlideImage?.File?.FileId == oldblock.WholeSlideImage?.File?.FileId).Any()) : null;
                                 if (publishedEntry == null)
                                 {
                                     retVal.Add(oldblock.WholeSlideImage?.File?.FilePath);