diff --git a/EpdBase/EpdBase.cpp b/EpdBase/EpdBase.cpp
index e6dd4c7..5f9494f 100644
--- a/EpdBase/EpdBase.cpp
+++ b/EpdBase/EpdBase.cpp
@@ -6,7 +6,7 @@ EpdBase::Epd2U::Epd2U(int comport)
 	port = comport;
 	SetAutoCommit(0);
 	Error = 123;
-	//LoadLibrary((LPWSTR)L"Reader2.dll");
+	
 	//SetTimeouts(port, 20, 1000, 1000);
 	//SetDiscoveryExpirationPeriod(port, 5000);
 	
diff --git a/EpdBaseClr/EpdBaseClr.cpp b/EpdBaseClr/EpdBaseClr.cpp
index c877729..8b211bb 100644
--- a/EpdBaseClr/EpdBaseClr.cpp
+++ b/EpdBaseClr/EpdBaseClr.cpp
@@ -4,11 +4,10 @@
 
 EpdBaseClr::Epd2::Epd2(int port)
 {
-	//LoadLibrary((LPCWSTR)L"reader2.dll");
+	//HANDLE hMod = LoadLibrary(L"Reader2.dll");
 	epd =  new EpdBase::Epd2U(port);
 	b = gcnew sEpdBase();
 	this->InitRV = epd->InitRv;
-
 }
 
 EpdBaseClr::Epd2::~Epd2()
diff --git a/EpdBaseClr/EpdBaseClr.vcxproj b/EpdBaseClr/EpdBaseClr.vcxproj
index caa441f..0db116d 100644
--- a/EpdBaseClr/EpdBaseClr.vcxproj
+++ b/EpdBaseClr/EpdBaseClr.vcxproj
@@ -96,6 +96,7 @@
     <Link>
       <AdditionalDependencies />
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
+      <PreventDllBinding>false</PreventDllBinding>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -163,13 +164,6 @@
       <Project>{3114a047-7562-42fe-94de-2418ef19ad9a}</Project>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="..\edosstation\edosstation.snk" />
-    <None Include="eDosStation.snk" />
-    <None Include="Reader2.dll">
-      <FileType>Discomap</FileType>
-    </None>
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/EpdBaseClr/EpdBaseClr.vcxproj.filters b/EpdBaseClr/EpdBaseClr.vcxproj.filters
index e83d23c..9eeba3a 100644
--- a/EpdBaseClr/EpdBaseClr.vcxproj.filters
+++ b/EpdBaseClr/EpdBaseClr.vcxproj.filters
@@ -46,9 +46,4 @@
       <Filter>Resource Files</Filter>
     </Image>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Reader2.dll" />
-    <None Include="..\edosstation\edosstation.snk" />
-    <None Include="eDosStation.snk" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/eDosStation/App.xaml.cs b/eDosStation/App.xaml.cs
index 87c7c38..737c8f0 100644
--- a/eDosStation/App.xaml.cs
+++ b/eDosStation/App.xaml.cs
@@ -15,17 +15,19 @@ namespace eDosStation
     /// </summary>
     public partial class App : Application
     {
-        [DllImport("kernel32", SetLastError = true, CharSet = CharSet.Ansi)]
-        static extern IntPtr LoadLibrary([MarshalAs(UnmanagedType.LPStr)]string lpFileName);
+        [DllImport("kernel32.dll",CharSet =CharSet.Auto, EntryPoint = "LoadLibraryEx")]
+        private static extern IntPtr LoadLibraryEx(string lpFileName, IntPtr hFile, uint dwFlags);
 
-
-        
-     
+        public System.IntPtr moduleHandle;
 
         private void Application_Startup(object sender, StartupEventArgs e)
         {
-            
-            //LoadLibrary("Reader2.dll");
+            //var pth1 = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "EpdBaseClr.dll");
+            //var pth2 = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Reader2.dll");
+
+                        
+            //moduleHandle = LoadLibraryEx(pth2, IntPtr.Zero, 0);
+            //moduleHandle = LoadLibraryEx(pth1, IntPtr.Zero, 0);
         }
     }
 }
diff --git a/eDosStation/EntryBadge.xaml b/eDosStation/EntryBadge.xaml
index 44ddbe9..7662b01 100644
--- a/eDosStation/EntryBadge.xaml
+++ b/eDosStation/EntryBadge.xaml
@@ -71,7 +71,6 @@
                                 <ListBox.ItemsPanel >
                                     <ItemsPanelTemplate  >
                                         <telerik:RadUniformGrid Columns="3" IsItemsHost="True"   />
-
                                     </ItemsPanelTemplate>
                                 </ListBox.ItemsPanel>
                                 <ListBox.ItemTemplate>
@@ -81,11 +80,12 @@
                                                 <TextBlock.Style>
                                                     <Style TargetType="TextBlock">
                                                         <Style.Triggers>
-                                                            <DataTrigger Binding="{Binding MarginExceeded}" Value="true">
-                                                                <Setter Property="Background" Value="Red"></Setter>
+                                                            <DataTrigger Binding="{Binding EPDRad}" Value="BG">
+                                                                <Setter Property="Background" Value="LightGray"></Setter>
                                                             </DataTrigger>
-                                                            <DataTrigger Binding="{Binding MarginExceeded}" Value="false">
-                                                                <Setter Property="Background" Value="Green"></Setter>
+                                                            <DataTrigger Binding="{Binding EPDRad}" Value="NG">
+                                                                <Setter Property="Background" Value="Black"></Setter>
+                                                                <Setter Property="Foreground" Value="White"></Setter>
                                                             </DataTrigger>
                                                         </Style.Triggers>
                                                     </Style>
diff --git a/eDosStation/EntryBadge.xaml.cs b/eDosStation/EntryBadge.xaml.cs
index 2f0bea7..37d51fe 100644
--- a/eDosStation/EntryBadge.xaml.cs
+++ b/eDosStation/EntryBadge.xaml.cs
@@ -208,11 +208,22 @@ namespace eDosStation
 
         private void SetFilter(bool isAlara)
         {
-            StringBuilder fi = new StringBuilder();
-            if (Inst1 == true) fi.Append($"{(Inst2 ? "(" : "") } Inst_CODE = {thisStation.Inst_CODE1} ");
-            if (Inst2 == true) fi.Append($" {(Inst1 ? "or" : "") } Inst_CODE={thisStation.Inst_CODE2} {(Inst1 ? ")" : "")} ");
-            fi.Append($" {(Inst1 || Inst2 ? "AND" : "") } TaskType_CODE { (isAlara ? ">=" : "<")} '1000' ");
+            Inst1 = cbInst1.IsChecked == true;
+            Inst2 = cbInst2.IsChecked == true;
 
+           
+            StringBuilder fi = new StringBuilder();
+            if (!Inst1 && !Inst2)
+            {
+
+                fi.Append(" 1=2 ");
+            }
+            else
+            {
+                if (Inst1 == true) fi.Append($"{(Inst2 ? "(" : "") } Inst_CODE = {thisStation.Inst_CODE1} ");
+                if (Inst2 == true) fi.Append($" {(Inst1 ? "or" : "") } Inst_CODE={thisStation.Inst_CODE2} {(Inst1 ? ")" : "")} ");
+                fi.Append($" {(Inst1 || Inst2 ? "AND" : "") } TaskType_CODE { (isAlara ? ">=" : "<")} '1000' ");
+            }
             System.Windows.Data.CollectionViewSource getTaskListViewSource = ((System.Windows.Data.CollectionViewSource)(this.FindResource("getTaskListViewSource")));
 
             var dv = getTaskListViewSource.View.SourceCollection as DataView;
diff --git a/eDosStation/eDosStation.csproj b/eDosStation/eDosStation.csproj
index be922b0..8027753 100644
--- a/eDosStation/eDosStation.csproj
+++ b/eDosStation/eDosStation.csproj
@@ -71,7 +71,7 @@
     <ApplicationIcon>mk2-epd-bg.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>eDosStation.snk</AssemblyOriginatorKeyFile>