diff --git a/Controllers/Budget.Controller.cs b/Controllers/Budget.Controller.cs
index a5782a3..f9338b0 100644
--- a/Controllers/Budget.Controller.cs
+++ b/Controllers/Budget.Controller.cs
@@ -2848,7 +2848,10 @@ namespace rmutr_report.Controllers
                 }
             }
 
-            budget.total = budget.details.Where(f=>f.topic_type==1).Sum(d => d.value1);
+            var sum1 = budget.details.Where(f=>f.topic_type==1).Sum(d => d.value1);
+            var sum2 = budget.details.Where(f=>f.topic_type==2).Sum(d => d.value2);
+            budget.total = sum1+sum2;
+            
             var budgetExpenditure = new List<budget_expenditure_report_from_revenue_v2>() { budget };
 
             Report report = new Report();
diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.dll b/bin/Debug/netcoreapp3.1/rmutr_report.dll
index a2711ae..3261559 100644
Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.dll and b/bin/Debug/netcoreapp3.1/rmutr_report.dll differ
diff --git a/bin/Debug/netcoreapp3.1/rmutr_report.pdb b/bin/Debug/netcoreapp3.1/rmutr_report.pdb
index 53d3679..d6ee5d7 100644
Binary files a/bin/Debug/netcoreapp3.1/rmutr_report.pdb and b/bin/Debug/netcoreapp3.1/rmutr_report.pdb differ
diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs
index b0159ae..80e0980 100644
--- a/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs
+++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+ad7e631bf7e42daeec9b6a95f26c164545940a8b")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+be506637963d971c493b17d48cff9051e6c1e186")]
 [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
index f0f4ddc..14ea95d 100644
--- a/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
+++ b/obj/Debug/net5.0/rmutr_report.AssemblyInfoInputs.cache
@@ -1 +1 @@
-a306e0787253414ac78b021754a61c89956f46a0bc6e3ccde2346272350fa1c1
+bb854ecd343ad1946095299c5eea83cbf1d92adfdf83d66497b41101e0ce62e3
diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs
index 0cd5c22..80e0980 100644
--- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+e01a898db79377f7359b7cb7b100c3a191789b60")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+be506637963d971c493b17d48cff9051e6c1e186")]
 [assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache
index 44225ae..14ea95d 100644
--- a/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.AssemblyInfoInputs.cache
@@ -1 +1 @@
-ef21d777cc2e98f70a736bf11f50ff1f992eb90bfb50cb377b635575349fe883
+bb854ecd343ad1946095299c5eea83cbf1d92adfdf83d66497b41101e0ce62e3
diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig b/obj/Debug/netcoreapp3.1/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig
index 5539f44..af449cb 100644
--- a/obj/Debug/netcoreapp3.1/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.GeneratedMSBuildEditorConfig.editorconfig
@@ -1,5 +1,5 @@
 is_global = true
 build_property.RootNamespace = rmutr_report
-build_property.ProjectDir = C:\Users\USER\Documents\rmutr_report\
+build_property.ProjectDir = C:\Users\USER\RiderProjects\rmutr_report\
 build_property.EnableComHosting = 
 build_property.EnableGeneratedComInterfaceComImportInterop = 
diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache
index 9ff0118..53a75a5 100644
--- a/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.RazorTargetAssemblyInfo.cache
@@ -1 +1 @@
-a40407391d18b2a6d279653d7ec163bb87aa57c154c5935881bd5a997b3724b2
+279632d20a71efddaec7d7dd8e4f82c69645ce40f221ec526dfebe37ed8f764e
diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.assets.cache b/obj/Debug/netcoreapp3.1/rmutr_report.assets.cache
index 6446abd..aa1acb1 100644
Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.assets.cache and b/obj/Debug/netcoreapp3.1/rmutr_report.assets.cache differ
diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache b/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache
index 6d5782a..4d44606 100644
--- a/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-da06089eb1c3be2785a14fe62b3131711b3e91545e14a70bec5baf07f6b78f23
+fde8a6f63407284f2bcd1c9b0bb1eb123543982b9dc3ae00f91bf72ae5c98bcf
diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.csproj.FileListAbsolute.txt b/obj/Debug/netcoreapp3.1/rmutr_report.csproj.FileListAbsolute.txt
index d442047..236ed57 100644
--- a/obj/Debug/netcoreapp3.1/rmutr_report.csproj.FileListAbsolute.txt
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.csproj.FileListAbsolute.txt
@@ -171,3 +171,8 @@ C:\Users\USER\Documents\rmutr_report\obj\Debug\netcoreapp3.1\staticwebassets\msb
 C:\Users\USER\Documents\rmutr_report\obj\Debug\netcoreapp3.1\staticwebassets\msbuild.build.rmutr_report.props
 C:\Users\USER\Documents\rmutr_report\obj\Debug\netcoreapp3.1\staticwebassets\msbuild.buildMultiTargeting.rmutr_report.props
 C:\Users\USER\Documents\rmutr_report\obj\Debug\netcoreapp3.1\staticwebassets\msbuild.buildTransitive.rmutr_report.props
+C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\staticwebassets\rmutr_report.StaticWebAssets.Pack.cache
+C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\staticwebassets\msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props
+C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\staticwebassets\msbuild.build.rmutr_report.props
+C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\staticwebassets\msbuild.buildMultiTargeting.rmutr_report.props
+C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\netcoreapp3.1\staticwebassets\msbuild.buildTransitive.rmutr_report.props
diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.dll b/obj/Debug/netcoreapp3.1/rmutr_report.dll
index a2711ae..3261559 100644
Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.dll and b/obj/Debug/netcoreapp3.1/rmutr_report.dll differ
diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.genruntimeconfig.cache b/obj/Debug/netcoreapp3.1/rmutr_report.genruntimeconfig.cache
index 29a0fc8..04db7d9 100644
--- a/obj/Debug/netcoreapp3.1/rmutr_report.genruntimeconfig.cache
+++ b/obj/Debug/netcoreapp3.1/rmutr_report.genruntimeconfig.cache
@@ -1 +1 @@
-ca711009e2e2dba58c1b6eb5113bdab6ea15153c71afb320690fda9321e8edef
+bda828ec15dde51b3edf3fa2b1be38642772082a316e99c376c9cc567aeff712
diff --git a/obj/Debug/netcoreapp3.1/rmutr_report.pdb b/obj/Debug/netcoreapp3.1/rmutr_report.pdb
index 53d3679..d6ee5d7 100644
Binary files a/obj/Debug/netcoreapp3.1/rmutr_report.pdb and b/obj/Debug/netcoreapp3.1/rmutr_report.pdb differ
diff --git a/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props b/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props
index e931b1f..bf5e9e1 100644
--- a/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props
+++ b/obj/Debug/netcoreapp3.1/staticwebassets/msbuild.rmutr_report.Microsoft.AspNetCore.StaticWebAssets.props
@@ -112,6 +112,22 @@
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
       <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue_v2.frx))</OriginalItemSpec>
     </StaticWebAsset>
+    <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue_v3.frx))">
+      <SourceType>Package</SourceType>
+      <SourceId>rmutr_report</SourceId>
+      <ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
+      <BasePath>_content/rmutr_report</BasePath>
+      <RelativePath>reports\budget_expenditure_report_from_revenue_v3.frx</RelativePath>
+      <AssetKind></AssetKind>
+      <AssetMode></AssetMode>
+      <AssetRole></AssetRole>
+      <RelatedAsset></RelatedAsset>
+      <AssetTraitName></AssetTraitName>
+      <AssetTraitValue></AssetTraitValue>
+      <CopyToOutputDirectory></CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_expenditure_report_from_revenue_v3.frx))</OriginalItemSpec>
+    </StaticWebAsset>
     <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\budget_progress_insurances.frx))">
       <SourceType>Package</SourceType>
       <SourceId>rmutr_report</SourceId>
@@ -528,6 +544,22 @@
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
       <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\durable_articles_three_old.frx))</OriginalItemSpec>
     </StaticWebAsset>
+    <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\estimate_income_expenses.frx))">
+      <SourceType>Package</SourceType>
+      <SourceId>rmutr_report</SourceId>
+      <ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
+      <BasePath>_content/rmutr_report</BasePath>
+      <RelativePath>reports\estimate_income_expenses.frx</RelativePath>
+      <AssetKind></AssetKind>
+      <AssetMode></AssetMode>
+      <AssetRole></AssetRole>
+      <RelatedAsset></RelatedAsset>
+      <AssetTraitName></AssetTraitName>
+      <AssetTraitValue></AssetTraitValue>
+      <CopyToOutputDirectory></CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\estimate_income_expenses.frx))</OriginalItemSpec>
+    </StaticWebAsset>
     <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\expenditure_budget_proposal.frx))">
       <SourceType>Package</SourceType>
       <SourceId>rmutr_report</SourceId>
@@ -2928,6 +2960,22 @@
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
       <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\summary_graduation_notification.frx))</OriginalItemSpec>
     </StaticWebAsset>
+    <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\summary_income_allocation.frx))">
+      <SourceType>Package</SourceType>
+      <SourceId>rmutr_report</SourceId>
+      <ContentRoot>$(MSBuildThisFileDirectory)..\staticwebassets\</ContentRoot>
+      <BasePath>_content/rmutr_report</BasePath>
+      <RelativePath>reports\summary_income_allocation.frx</RelativePath>
+      <AssetKind></AssetKind>
+      <AssetMode></AssetMode>
+      <AssetRole></AssetRole>
+      <RelatedAsset></RelatedAsset>
+      <AssetTraitName></AssetTraitName>
+      <AssetTraitValue></AssetTraitValue>
+      <CopyToOutputDirectory></CopyToOutputDirectory>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+      <OriginalItemSpec>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\summary_income_allocation.frx))</OriginalItemSpec>
+    </StaticWebAsset>
     <StaticWebAsset Include="$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\staticwebassets\reports\summary_income_cooperative.frx))">
       <SourceType>Package</SourceType>
       <SourceId>rmutr_report</SourceId>
diff --git a/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache b/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache
index 23efb3e..f7c5d6b 100644
--- a/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache
+++ b/obj/Debug/netcoreapp3.1/staticwebassets/rmutr_report.StaticWebAssets.Pack.cache
@@ -1 +1 @@
-3a5ed6e019ac50427c04c5dcc311649c0287e5ab2253e898c63f505c41bfa92f
+33814906f52e0f8cfd7bb5360baea6c562ab42de0f2574d78acf3490ba1b4515
diff --git a/obj/rider.project.restore.info b/obj/rider.project.restore.info
index 4b187a0..df16566 100644
--- a/obj/rider.project.restore.info
+++ b/obj/rider.project.restore.info
@@ -1 +1 @@
-17235282175005895
\ No newline at end of file
+17241552033399582
\ No newline at end of file