diff --git a/eDosStation/App.config b/eDosStation/App.config
index 417ea9b..98b9049 100644
--- a/eDosStation/App.config
+++ b/eDosStation/App.config
@@ -17,6 +17,18 @@
             <setting name="comport" serializeAs="String">
                 <value>1</value>
             </setting>
+            <setting name="Inst_CODE1" serializeAs="String">
+                <value>1</value>
+            </setting>
+            <setting name="Inst_CODE2" serializeAs="String">
+                <value>11</value>
+            </setting>
+            <setting name="Inst_Name1" serializeAs="String">
+                <value>BR1</value>
+            </setting>
+            <setting name="Inst_Name2" serializeAs="String">
+                <value>Venus</value>
+            </setting>
         </eDosStation.Properties.Settings>
     </userSettings>
 </configuration>
\ No newline at end of file
diff --git a/eDosStation/DataSet1.Designer.cs b/eDosStation/DataSet1.Designer.cs
index 0902d1e..578d920 100644
--- a/eDosStation/DataSet1.Designer.cs
+++ b/eDosStation/DataSet1.Designer.cs
@@ -322,6 +322,10 @@ namespace eDosStation {
             
             private global::System.Data.DataColumn columnEPDRad;
             
+            private global::System.Data.DataColumn columnInst_CODE;
+            
+            private global::System.Data.DataColumn columnTaskType_CODE;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public GetTaskListDataTable() {
@@ -387,6 +391,22 @@ namespace eDosStation {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public global::System.Data.DataColumn Inst_CODEColumn {
+                get {
+                    return this.columnInst_CODE;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public global::System.Data.DataColumn TaskType_CODEColumn {
+                get {
+                    return this.columnTaskType_CODE;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -424,13 +444,15 @@ namespace eDosStation {
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
-            public GetTaskListRow AddGetTaskListRow(string Task_Name, string TaskDescription, string EPDRad) {
+            public GetTaskListRow AddGetTaskListRow(string Task_Name, string TaskDescription, string EPDRad, int Inst_CODE, int TaskType_CODE) {
                 GetTaskListRow rowGetTaskListRow = ((GetTaskListRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
                         Task_Name,
                         TaskDescription,
-                        EPDRad};
+                        EPDRad,
+                        Inst_CODE,
+                        TaskType_CODE};
                 rowGetTaskListRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowGetTaskListRow);
                 return rowGetTaskListRow;
@@ -464,6 +486,8 @@ namespace eDosStation {
                 this.columnTask_Name = base.Columns["Task_Name"];
                 this.columnTaskDescription = base.Columns["TaskDescription"];
                 this.columnEPDRad = base.Columns["EPDRad"];
+                this.columnInst_CODE = base.Columns["Inst_CODE"];
+                this.columnTaskType_CODE = base.Columns["TaskType_CODE"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -477,6 +501,10 @@ namespace eDosStation {
                 base.Columns.Add(this.columnTaskDescription);
                 this.columnEPDRad = new global::System.Data.DataColumn("EPDRad", typeof(string), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnEPDRad);
+                this.columnInst_CODE = new global::System.Data.DataColumn("Inst_CODE", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnInst_CODE);
+                this.columnTaskType_CODE = new global::System.Data.DataColumn("TaskType_CODE", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnTaskType_CODE);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnID_Task}, true));
                 this.columnID_Task.AutoIncrement = true;
@@ -671,6 +699,10 @@ namespace eDosStation {
             
             private global::System.Data.DataColumn columnMarginExceeded;
             
+            private global::System.Data.DataColumn columnTaskType_CODE;
+            
+            private global::System.Data.DataColumn columnInst_CODE1;
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public GetTaskInfoDataTable() {
@@ -896,6 +928,22 @@ namespace eDosStation {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public global::System.Data.DataColumn TaskType_CODEColumn {
+                get {
+                    return this.columnTaskType_CODE;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public global::System.Data.DataColumn Inst_CODE1Column {
+                get {
+                    return this.columnInst_CODE1;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             [global::System.ComponentModel.Browsable(false)]
@@ -956,7 +1004,9 @@ namespace eDosStation {
                         string Description, 
                         int Inst_CODE, 
                         double MinWorkerDosisMargin, 
-                        bool MarginExceeded) {
+                        bool MarginExceeded, 
+                        int TaskType_CODE, 
+                        int Inst_CODE1) {
                 GetTaskInfoRow rowGetTaskInfoRow = ((GetTaskInfoRow)(this.NewRow()));
                 object[] columnValuesArray = new object[] {
                         null,
@@ -982,7 +1032,9 @@ namespace eDosStation {
                         Description,
                         Inst_CODE,
                         MinWorkerDosisMargin,
-                        MarginExceeded};
+                        MarginExceeded,
+                        TaskType_CODE,
+                        Inst_CODE1};
                 rowGetTaskInfoRow.ItemArray = columnValuesArray;
                 this.Rows.Add(rowGetTaskInfoRow);
                 return rowGetTaskInfoRow;
@@ -1036,6 +1088,8 @@ namespace eDosStation {
                 this.columnInst_CODE = base.Columns["Inst_CODE"];
                 this.columnMinWorkerDosisMargin = base.Columns["MinWorkerDosisMargin"];
                 this.columnMarginExceeded = base.Columns["MarginExceeded"];
+                this.columnTaskType_CODE = base.Columns["TaskType_CODE"];
+                this.columnInst_CODE1 = base.Columns["Inst_CODE1"];
             }
             
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -1089,6 +1143,10 @@ namespace eDosStation {
                 base.Columns.Add(this.columnMinWorkerDosisMargin);
                 this.columnMarginExceeded = new global::System.Data.DataColumn("MarginExceeded", typeof(bool), null, global::System.Data.MappingType.Element);
                 base.Columns.Add(this.columnMarginExceeded);
+                this.columnTaskType_CODE = new global::System.Data.DataColumn("TaskType_CODE", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnTaskType_CODE);
+                this.columnInst_CODE1 = new global::System.Data.DataColumn("Inst_CODE1", typeof(int), null, global::System.Data.MappingType.Element);
+                base.Columns.Add(this.columnInst_CODE1);
                 this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
                                 this.columnID_Task}, true));
                 this.columnID_Task.AutoIncrement = true;
@@ -1299,6 +1357,38 @@ namespace eDosStation {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public int Inst_CODE {
+                get {
+                    try {
+                        return ((int)(this[this.tableGetTaskList.Inst_CODEColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'Inst_CODE\' in table \'GetTaskList\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableGetTaskList.Inst_CODEColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public int TaskType_CODE {
+                get {
+                    try {
+                        return ((int)(this[this.tableGetTaskList.TaskType_CODEColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'TaskType_CODE\' in table \'GetTaskList\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableGetTaskList.TaskType_CODEColumn] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public bool IsTask_NameNull() {
@@ -1322,6 +1412,30 @@ namespace eDosStation {
             public void SetTaskDescriptionNull() {
                 this[this.tableGetTaskList.TaskDescriptionColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public bool IsInst_CODENull() {
+                return this.IsNull(this.tableGetTaskList.Inst_CODEColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public void SetInst_CODENull() {
+                this[this.tableGetTaskList.Inst_CODEColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public bool IsTaskType_CODENull() {
+                return this.IsNull(this.tableGetTaskList.TaskType_CODEColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public void SetTaskType_CODENull() {
+                this[this.tableGetTaskList.TaskType_CODEColumn] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -1712,6 +1826,38 @@ namespace eDosStation {
                 }
             }
             
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public int TaskType_CODE {
+                get {
+                    try {
+                        return ((int)(this[this.tableGetTaskInfo.TaskType_CODEColumn]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'TaskType_CODE\' in table \'GetTaskInfo\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableGetTaskInfo.TaskType_CODEColumn] = value;
+                }
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public int Inst_CODE1 {
+                get {
+                    try {
+                        return ((int)(this[this.tableGetTaskInfo.Inst_CODE1Column]));
+                    }
+                    catch (global::System.InvalidCastException e) {
+                        throw new global::System.Data.StrongTypingException("The value for column \'Inst_CODE1\' in table \'GetTaskInfo\' is DBNull.", e);
+                    }
+                }
+                set {
+                    this[this.tableGetTaskInfo.Inst_CODE1Column] = value;
+                }
+            }
+            
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
             public bool IsTask_NameNull() {
@@ -1975,6 +2121,30 @@ namespace eDosStation {
             public void SetMarginExceededNull() {
                 this[this.tableGetTaskInfo.MarginExceededColumn] = global::System.Convert.DBNull;
             }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public bool IsTaskType_CODENull() {
+                return this.IsNull(this.tableGetTaskInfo.TaskType_CODEColumn);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public void SetTaskType_CODENull() {
+                this[this.tableGetTaskInfo.TaskType_CODEColumn] = global::System.Convert.DBNull;
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public bool IsInst_CODE1Null() {
+                return this.IsNull(this.tableGetTaskInfo.Inst_CODE1Column);
+            }
+            
+            [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+            [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+            public void SetInst_CODE1Null() {
+                this[this.tableGetTaskInfo.Inst_CODE1Column] = global::System.Convert.DBNull;
+            }
         }
         
         /// <summary>
@@ -2174,6 +2344,8 @@ namespace eDosStation.DataSet1TableAdapters {
             tableMapping.ColumnMappings.Add("Task_Name", "Task_Name");
             tableMapping.ColumnMappings.Add("TaskDescription", "TaskDescription");
             tableMapping.ColumnMappings.Add("EPDRad", "EPDRad");
+            tableMapping.ColumnMappings.Add("Inst_CODE", "Inst_CODE");
+            tableMapping.ColumnMappings.Add("TaskType_CODE", "TaskType_CODE");
             this._adapter.TableMappings.Add(tableMapping);
         }
         
@@ -2365,6 +2537,8 @@ namespace eDosStation.DataSet1TableAdapters {
             tableMapping.ColumnMappings.Add("Inst_CODE", "Inst_CODE");
             tableMapping.ColumnMappings.Add("MinWorkerDosisMargin", "MinWorkerDosisMargin");
             tableMapping.ColumnMappings.Add("MarginExceeded", "MarginExceeded");
+            tableMapping.ColumnMappings.Add("TaskType_CODE", "TaskType_CODE");
+            tableMapping.ColumnMappings.Add("Inst_CODE1", "Inst_CODE1");
             this._adapter.TableMappings.Add(tableMapping);
         }
         
diff --git a/eDosStation/DataSet1.xsd b/eDosStation/DataSet1.xsd
index f6f9284..776841e 100644
--- a/eDosStation/DataSet1.xsd
+++ b/eDosStation/DataSet1.xsd
@@ -25,6 +25,8 @@
               <Mapping SourceColumn="Task_Name" DataSetColumn="Task_Name" />
               <Mapping SourceColumn="TaskDescription" DataSetColumn="TaskDescription" />
               <Mapping SourceColumn="EPDRad" DataSetColumn="EPDRad" />
+              <Mapping SourceColumn="Inst_CODE" DataSetColumn="Inst_CODE" />
+              <Mapping SourceColumn="TaskType_CODE" DataSetColumn="TaskType_CODE" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -68,6 +70,8 @@
               <Mapping SourceColumn="Inst_CODE" DataSetColumn="Inst_CODE" />
               <Mapping SourceColumn="MinWorkerDosisMargin" DataSetColumn="MinWorkerDosisMargin" />
               <Mapping SourceColumn="MarginExceeded" DataSetColumn="MarginExceeded" />
+              <Mapping SourceColumn="TaskType_CODE" DataSetColumn="TaskType_CODE" />
+              <Mapping SourceColumn="Inst_CODE1" DataSetColumn="Inst_CODE1" />
             </Mappings>
             <Sources />
           </TableAdapter>
@@ -79,7 +83,7 @@
   <xs:element name="DataSet1" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DataSet1" msprop:Generator_UserDSName="DataSet1">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="GetTaskList" msprop:Generator_TableClassName="GetTaskListDataTable" msprop:Generator_TableVarName="tableGetTaskList" msprop:Generator_RowChangedName="GetTaskListRowChanged" msprop:Generator_TablePropName="GetTaskList" msprop:Generator_RowDeletingName="GetTaskListRowDeleting" msprop:Generator_RowChangingName="GetTaskListRowChanging" msprop:Generator_RowEvHandlerName="GetTaskListRowChangeEventHandler" msprop:Generator_RowDeletedName="GetTaskListRowDeleted" msprop:Generator_RowClassName="GetTaskListRow" msprop:Generator_UserTableName="GetTaskList" msprop:Generator_RowEvArgName="GetTaskListRowChangeEvent">
+        <xs:element name="GetTaskList" msprop:Generator_TableClassName="GetTaskListDataTable" msprop:Generator_TableVarName="tableGetTaskList" msprop:Generator_TablePropName="GetTaskList" msprop:Generator_RowDeletingName="GetTaskListRowDeleting" msprop:Generator_RowChangingName="GetTaskListRowChanging" msprop:Generator_RowEvHandlerName="GetTaskListRowChangeEventHandler" msprop:Generator_RowDeletedName="GetTaskListRowDeleted" msprop:Generator_UserTableName="GetTaskList" msprop:Generator_RowChangedName="GetTaskListRowChanged" msprop:Generator_RowEvArgName="GetTaskListRowChangeEvent" msprop:Generator_RowClassName="GetTaskListRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ID_Task" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnID_Task" msprop:Generator_ColumnPropNameInRow="ID_Task" msprop:Generator_ColumnPropNameInTable="ID_TaskColumn" msprop:Generator_UserColumnName="ID_Task" type="xs:int" />
@@ -104,10 +108,12 @@
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="Inst_CODE" msprop:Generator_ColumnVarNameInTable="columnInst_CODE" msprop:Generator_ColumnPropNameInRow="Inst_CODE" msprop:Generator_ColumnPropNameInTable="Inst_CODEColumn" msprop:Generator_UserColumnName="Inst_CODE" type="xs:int" minOccurs="0" />
+              <xs:element name="TaskType_CODE" msprop:Generator_ColumnVarNameInTable="columnTaskType_CODE" msprop:Generator_ColumnPropNameInRow="TaskType_CODE" msprop:Generator_ColumnPropNameInTable="TaskType_CODEColumn" msprop:Generator_UserColumnName="TaskType_CODE" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="GetTaskInfo" msprop:Generator_TableClassName="GetTaskInfoDataTable" msprop:Generator_TableVarName="tableGetTaskInfo" msprop:Generator_TablePropName="GetTaskInfo" msprop:Generator_RowDeletingName="GetTaskInfoRowDeleting" msprop:Generator_RowChangingName="GetTaskInfoRowChanging" msprop:Generator_RowEvHandlerName="GetTaskInfoRowChangeEventHandler" msprop:Generator_RowDeletedName="GetTaskInfoRowDeleted" msprop:Generator_UserTableName="GetTaskInfo" msprop:Generator_RowChangedName="GetTaskInfoRowChanged" msprop:Generator_RowEvArgName="GetTaskInfoRowChangeEvent" msprop:Generator_RowClassName="GetTaskInfoRow">
+        <xs:element name="GetTaskInfo" msprop:Generator_TableClassName="GetTaskInfoDataTable" msprop:Generator_TableVarName="tableGetTaskInfo" msprop:Generator_RowChangedName="GetTaskInfoRowChanged" msprop:Generator_TablePropName="GetTaskInfo" msprop:Generator_RowDeletingName="GetTaskInfoRowDeleting" msprop:Generator_RowChangingName="GetTaskInfoRowChanging" msprop:Generator_RowEvHandlerName="GetTaskInfoRowChangeEventHandler" msprop:Generator_RowDeletedName="GetTaskInfoRowDeleted" msprop:Generator_RowClassName="GetTaskInfoRow" msprop:Generator_UserTableName="GetTaskInfo" msprop:Generator_RowEvArgName="GetTaskInfoRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ID_Task" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnID_Task" msprop:Generator_ColumnPropNameInRow="ID_Task" msprop:Generator_ColumnPropNameInTable="ID_TaskColumn" msprop:Generator_UserColumnName="ID_Task" type="xs:int" />
@@ -164,6 +170,8 @@
               <xs:element name="Inst_CODE" msprop:Generator_ColumnVarNameInTable="columnInst_CODE" msprop:Generator_ColumnPropNameInRow="Inst_CODE" msprop:Generator_ColumnPropNameInTable="Inst_CODEColumn" msprop:Generator_UserColumnName="Inst_CODE" type="xs:int" minOccurs="0" />
               <xs:element name="MinWorkerDosisMargin" msprop:Generator_ColumnVarNameInTable="columnMinWorkerDosisMargin" msprop:Generator_ColumnPropNameInRow="MinWorkerDosisMargin" msprop:Generator_ColumnPropNameInTable="MinWorkerDosisMarginColumn" msprop:Generator_UserColumnName="MinWorkerDosisMargin" type="xs:double" minOccurs="0" />
               <xs:element name="MarginExceeded" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnMarginExceeded" msprop:Generator_ColumnPropNameInRow="MarginExceeded" msprop:Generator_ColumnPropNameInTable="MarginExceededColumn" msprop:Generator_UserColumnName="MarginExceeded" type="xs:boolean" minOccurs="0" />
+              <xs:element name="TaskType_CODE" msprop:Generator_ColumnVarNameInTable="columnTaskType_CODE" msprop:Generator_ColumnPropNameInRow="TaskType_CODE" msprop:Generator_ColumnPropNameInTable="TaskType_CODEColumn" msprop:Generator_UserColumnName="TaskType_CODE" type="xs:int" minOccurs="0" />
+              <xs:element name="Inst_CODE1" msprop:Generator_ColumnVarNameInTable="columnInst_CODE1" msprop:Generator_ColumnPropNameInRow="Inst_CODE1" msprop:Generator_ColumnPropNameInTable="Inst_CODE1Column" msprop:Generator_UserColumnName="Inst_CODE1" type="xs:int" minOccurs="0" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
diff --git a/eDosStation/DataSet1.xss b/eDosStation/DataSet1.xss
index 8c4c522..e88812e 100644
--- a/eDosStation/DataSet1.xss
+++ b/eDosStation/DataSet1.xss
@@ -6,7 +6,7 @@
 </autogenerated>-->
 <DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:GetTaskList" ZOrder="2" X="70" Y="70" Height="153" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:GetTaskList" ZOrder="2" X="70" Y="70" Height="191" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
     <Shape ID="DesignTable:GetTaskInfo" ZOrder="1" X="351" Y="70" Height="305" Width="270" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
   </Shapes>
   <Connectors />
diff --git a/eDosStation/EntryBadge.xaml b/eDosStation/EntryBadge.xaml
index 6d31c3c..cee648d 100644
--- a/eDosStation/EntryBadge.xaml
+++ b/eDosStation/EntryBadge.xaml
@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:eDosStation"
         xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation" x:Class="eDosStation.EntryBadge"
         mc:Ignorable="d"
-        Title="EntryBadge" Height="768" Width="1024" Loaded="Window_Loaded" FontFamily="Comic Sans MS">
+        Title="EntryBadge" Height="980" Width="1820" Loaded="Window_Loaded" FontFamily="Comic Sans MS" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" WindowState="Maximized" >
     <Window.Resources>
         <local:DataSet1 x:Key="dataSet1"/>
         <CollectionViewSource x:Key="getTaskListViewSource" Source="{Binding GetTaskInfo, Source={StaticResource dataSet1}}"/>
@@ -55,25 +55,26 @@
                         <StackPanel Orientation="Horizontal" Grid.Column="0">
                             <telerik:RadToggleButton Name="cbAlara" HorizontalAlignment="Left" Width="150" Content="Normal" TextBlock.FontSize="24" Checked="CbAlara_Checked" Unchecked="CbAlara_Checked" IsChecked="False" CornerRadius="15" />
                         </StackPanel>
-                        <TextBlock Grid.Column="1"  FontSize="36" TextAlignment="Center" Text="Select the Task" />
-                    </Grid>
+                        <TextBlock Grid.Column="1"  FontSize="36" TextAlignment="Center"  Text="Choose a task"  />
+                            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Column="3">
+                                <telerik:RadToggleButton Name="cbInst1" HorizontalAlignment="Left" Width="150" Content="Inst1" TextBlock.FontSize="24" Checked="CbInst1_Checked" Unchecked="CbInst1_Checked" IsChecked="True" CornerRadius="15" />
+                                <telerik:RadToggleButton Name="cbInst2" HorizontalAlignment="Left" Width="150" Content="Inst2" TextBlock.FontSize="24" Checked="CbInst2_Checked" Unchecked="CbInst2_Checked" IsChecked="false" Visibility="Collapsed"  CornerRadius="15" />
+                            </StackPanel>
+                        </Grid>
                 </Border>
                 <StackPanel Grid.Row="1" Orientation="Vertical" HorizontalAlignment="Stretch"   >
-                    <ScrollViewer VerticalScrollBarVisibility="Visible"  Style="{Binding Mode=OneWay, Source={StaticResource CustomScrollViewer}}" >
-                        <ListBox ItemsSource="{Binding Mode=OneWay}" 
-                             MinHeight="100" 
-                             SelectedValuePath="ID_Task"   SelectionChanged="ListBox_SelectionChanged"
-                             >
+                    <ScrollViewer VerticalScrollBarVisibility="Visible"  Style="{Binding Mode=OneWay, Source={StaticResource CustomScrollViewer}}" Height="753">
+                        <ListBox ItemsSource="{Binding Mode=OneWay}" SelectedValuePath="ID_Task" SelectionChanged="ListBox_SelectionChanged"  >
                             <ListBox.ItemsPanel >
                                 <ItemsPanelTemplate  >
-                                    <WrapPanel IsItemsHost="True" Orientation="Vertical" >
-                                    </WrapPanel>
-                                </ItemsPanelTemplate>
+                                        <telerik:RadUniformGrid Columns="3" IsItemsHost="True"   />
+
+                                    </ItemsPanelTemplate>
                             </ListBox.ItemsPanel>
                             <ListBox.ItemTemplate>
                                 <DataTemplate>
                                     <StackPanel Orientation="Horizontal" TextBlock.FontSize="20" Margin="5,5,5,5" >
-                                        <TextBlock Text="{Binding ID_Task}" Width="50"   >
+                                            <TextBlock Text="{Binding TaskType_CODE}" Width="50"   >
                                             <TextBlock.Style>
                                                 <Style TargetType="TextBlock">
                                                     <Style.Triggers>
diff --git a/eDosStation/EntryBadge.xaml.cs b/eDosStation/EntryBadge.xaml.cs
index 3d38131..80bef33 100644
--- a/eDosStation/EntryBadge.xaml.cs
+++ b/eDosStation/EntryBadge.xaml.cs
@@ -28,6 +28,7 @@ namespace eDosStation
         bool EpdFound = false;
         DispatcherTimer dispatcherTimer;
         int Search;
+        Boolean Inst1 = false, Inst2 = false;
 
         public static OkReadBadge.Badging a;
         System.Threading.Thread t;
@@ -187,6 +188,29 @@ namespace eDosStation
 
         }
 
+
+        private void  SetFilter(bool isAlara)
+        {
+            StringBuilder fi = new StringBuilder();
+            if (Inst1==true) fi.Append($"{(Inst2 ? "(" : "") } Inst_CODE = {Properties.Settings.Default.Inst_CODE1} ");
+            if (Inst2==true) fi.Append($" {(Inst1 ? "or" : "") } Inst_CODE={Properties.Settings.Default.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;
+            //if (isAlara) dv.RowFilter = "ID_Task>=1000"; else dv.RowFilter = "ID_Task<1000";
+            try
+            {
+                dv.RowFilter = fi.ToString();
+            } catch (System.Exception ex)
+            {
+
+            }
+            getTaskListViewSource.View.MoveCurrentToFirst();
+
+           
+        }
         void AskTask()
         {
             if (_User == null || _User.VisitIDLocked==true || _User.AccessAllow==false)
@@ -198,13 +222,14 @@ namespace eDosStation
             }
             else
             {
-
                 eDosStation.DataSet1 dataSet1 = ((eDosStation.DataSet1)(this.FindResource("dataSet1")));
                 using (var dataSet1GetTaskInfoTableAdapter = new eDosStation.DataSet1TableAdapters.GetTaskInfoTableAdapter())
                 {
                     dataSet1GetTaskInfoTableAdapter.Fill(dataSet1.GetTaskInfo, null, _User.Margin);
                 }
                 tbTask.IsSelected = true;
+                SetFilter(false);
+                
             }
 
         }
@@ -342,16 +367,28 @@ namespace eDosStation
             
             bool isAlara = (cbAlara.IsChecked == true);
             if (isAlara) cbAlara.Content = "Alara"; else cbAlara.Content = "Normal";
-            //cbNormal.IsChecked = !isAlara;
-            System.Windows.Data.CollectionViewSource getTaskListViewSource = ((System.Windows.Data.CollectionViewSource)(this.FindResource("getTaskListViewSource")));
-
-            var dv = getTaskListViewSource.View.SourceCollection as DataView;
-            if (isAlara) dv.RowFilter = "ID_Task>=1000"; else dv.RowFilter = "ID_Task<1000";
-            getTaskListViewSource.View.MoveCurrentToFirst();
+            SetFilter(isAlara);
             
         }
 
-    
+        private void CbInst1_Checked(object sender, RoutedEventArgs e)
+        {
+
+            Inst1 = (cbInst1.IsChecked == true);
+            //Inst2 = (cbInst2.IsChecked == true);
+            bool isAlara = (cbAlara.IsChecked == true);
+            SetFilter(isAlara);
+        }
+
+        private void CbInst2_Checked(object sender, RoutedEventArgs e)
+        {
+            //Inst1 = (cbInst1.IsChecked == true);
+            Inst2 = (cbInst2.IsChecked == true);
+            bool isAlara = (cbAlara.IsChecked == true);
+            SetFilter(isAlara);
+        }
+
+
 
         private void Starter()
         {
@@ -363,20 +400,26 @@ namespace eDosStation
             tbEntry.IsSelected = true;
             bEpdDone.Visibility = Visibility.Hidden;
 
-            eDosStation.DataSet1 dataSet1 = ((eDosStation.DataSet1)(this.FindResource("dataSet1")));
-            //using (eDosStation.DataSet1TableAdapters.GetTaskListTableAdapter dataSet1GetTaskListTableAdapter = new eDosStation.DataSet1TableAdapters.GetTaskListTableAdapter())
-            //{
-            //    dataSet1GetTaskListTableAdapter.Fill(dataSet1.GetTaskList);
-            //}
-            using (var dataSet1GetTaskInfoTableAdapter = new eDosStation.DataSet1TableAdapters.GetTaskInfoTableAdapter())
+            cbInst1.Content = Properties.Settings.Default.Inst_Name1;
+            if (Properties.Settings.Default.Inst_CODE2>0)
             {
-                dataSet1GetTaskInfoTableAdapter.Fill(dataSet1.GetTaskInfo, null, null);
+                cbInst2.Content = Properties.Settings.Default.Inst_Name2;
+                cbInst2.Visibility = Visibility.Visible;
             }
+            //eDosStation.DataSet1 dataSet1 = ((eDosStation.DataSet1)(this.FindResource("dataSet1")));
+            ////using (eDosStation.DataSet1TableAdapters.GetTaskListTableAdapter dataSet1GetTaskListTableAdapter = new eDosStation.DataSet1TableAdapters.GetTaskListTableAdapter())
+            ////{
+            ////    dataSet1GetTaskListTableAdapter.Fill(dataSet1.GetTaskList);
+            ////}
+            //using (var dataSet1GetTaskInfoTableAdapter = new eDosStation.DataSet1TableAdapters.GetTaskInfoTableAdapter())
+            //{
+            //    dataSet1GetTaskInfoTableAdapter.Fill(dataSet1.GetTaskInfo, null, null);
+            //}
 
 
 
-            System.Windows.Data.CollectionViewSource getTaskListViewSource = ((System.Windows.Data.CollectionViewSource)(this.FindResource("getTaskListViewSource")));
-            getTaskListViewSource.View.MoveCurrentToFirst();
+            //System.Windows.Data.CollectionViewSource getTaskListViewSource = ((System.Windows.Data.CollectionViewSource)(this.FindResource("getTaskListViewSource")));
+            //getTaskListViewSource.View.MoveCurrentToFirst();
 
 
             ////Real
diff --git a/eDosStation/MainWindow.xaml b/eDosStation/MainWindow.xaml
index 1c25c82..7b0d086 100644
--- a/eDosStation/MainWindow.xaml
+++ b/eDosStation/MainWindow.xaml
@@ -6,7 +6,7 @@
         xmlns:local="clr-namespace:eDosStation"
         xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
         mc:Ignorable="d"
-        Title="eDose Station" Height="450" Width="800" FontFamily="Comic Sans MS" FontSize="36">
+        Title="eDose Station" Height="814.417" Width="1316.258" FontFamily="Comic Sans MS" FontSize="36" WindowStartupLocation="CenterScreen">
     <DockPanel>
         <Menu DockPanel.Dock="Top">
             <MenuItem Header="Settings" Click="MenuItem_Click" >
@@ -24,7 +24,7 @@
                 <RowDefinition />
                 <RowDefinition />
             </Grid.RowDefinitions>
-            
+
             <telerik:RadButton Grid.Row="0" Grid.Column="0" Content="Entry" Name="bEntry" Click="BEntry_Click" Margin="10,10,10,10" CornerRadius="15"  />
             <telerik:RadButton Grid.Row="1" Grid.Column="0" Content="Exit" Name="bExit" Click="BExit_Click" Margin="10,10,10,10" CornerRadius="15"/>
             <telerik:RadButton Grid.Row="2" Grid.Column="0" Content="Show EPD Dosis" Click="Button_Click" Margin="10,10,10,10" CornerRadius="15"/>
diff --git a/eDosStation/Properties/Settings.Designer.cs b/eDosStation/Properties/Settings.Designer.cs
index 5126567..1ee5ac1 100644
--- a/eDosStation/Properties/Settings.Designer.cs
+++ b/eDosStation/Properties/Settings.Designer.cs
@@ -44,5 +44,53 @@ namespace eDosStation.Properties {
                 return ((string)(this["RemoteSQL"]));
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("1")]
+        public int Inst_CODE1 {
+            get {
+                return ((int)(this["Inst_CODE1"]));
+            }
+            set {
+                this["Inst_CODE1"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("11")]
+        public int Inst_CODE2 {
+            get {
+                return ((int)(this["Inst_CODE2"]));
+            }
+            set {
+                this["Inst_CODE2"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("BR1")]
+        public string Inst_Name1 {
+            get {
+                return ((string)(this["Inst_Name1"]));
+            }
+            set {
+                this["Inst_Name1"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("Venus")]
+        public string Inst_Name2 {
+            get {
+                return ((string)(this["Inst_Name2"]));
+            }
+            set {
+                this["Inst_Name2"] = value;
+            }
+        }
     }
 }
diff --git a/eDosStation/Properties/Settings.settings b/eDosStation/Properties/Settings.settings
index 7ee131f..53308d6 100644
--- a/eDosStation/Properties/Settings.settings
+++ b/eDosStation/Properties/Settings.settings
@@ -13,5 +13,17 @@
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
       <Value Profile="(Default)">Data Source=sqlsrv3.sck.be;Initial Catalog=HPH_REMS_new;Integrated Security=True</Value>
     </Setting>
+    <Setting Name="Inst_CODE1" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">1</Value>
+    </Setting>
+    <Setting Name="Inst_CODE2" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">11</Value>
+    </Setting>
+    <Setting Name="Inst_Name1" Type="System.String" Scope="User">
+      <Value Profile="(Default)">BR1</Value>
+    </Setting>
+    <Setting Name="Inst_Name2" Type="System.String" Scope="User">
+      <Value Profile="(Default)">Venus</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/eDosStation/Settings.xaml b/eDosStation/Settings.xaml
index df99bac..bcaac01 100644
--- a/eDosStation/Settings.xaml
+++ b/eDosStation/Settings.xaml
@@ -11,6 +11,9 @@
             <RowDefinition Height="50" />
             <RowDefinition Height="auto" />
             <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="150"/>
@@ -19,8 +22,18 @@
         <TextBlock Text="Com port"></TextBlock>
         <TextBox Name="tComPort" Text="1"  Grid.Column="1" />
 
-        <Button Grid.Row="1" Grid.Column="0" Content="OK" Name="bOK" Click="BOK_Click" />
-        <Button Grid.Row="1" Grid.Column="1" Content="Cancel" Name="bCancel" Click="BCancel_Click" />
+        <TextBlock Grid.Row="1" Grid.Column="0" Text="Installatie 1"></TextBlock>
+        <TextBox Grid.Row="1" Name="tInsCode1" Text="1"  Grid.Column="1" />
+        <TextBox Grid.Row="1" Name="tInsName1" Text="BR1"  Grid.Column="2" />
+
+
+        <TextBlock Grid.Row="2" Grid.Column="0" Text="Installatie 2"></TextBlock>
+        <TextBox Grid.Row="2" Name="tInsCode2" Text="11"  Grid.Column="1" />
+        <TextBox Grid.Row="2" Name="tInsName2" Text="Venus"  Grid.Column="2" />
+
+
+        <Button Grid.Row="3" Grid.Column="0" Content="OK" Name="bOK" Click="BOK_Click" />
+        <Button Grid.Row="3" Grid.Column="1" Content="Cancel" Name="bCancel" Click="BCancel_Click" />
         
     </Grid>
 </Window>
diff --git a/eDosStation/Settings.xaml.cs b/eDosStation/Settings.xaml.cs
index 40a20d8..000f02c 100644
--- a/eDosStation/Settings.xaml.cs
+++ b/eDosStation/Settings.xaml.cs
@@ -29,6 +29,10 @@ namespace eDosStation
             if (tComPort.Text != Properties.Settings.Default.comport.ToString())
             {
                 Properties.Settings.Default.comport = int.Parse(tComPort.Text);
+                Properties.Settings.Default.Inst_CODE1 = int.Parse(tInsCode1.Text);
+                Properties.Settings.Default.Inst_CODE2 = int.Parse(tInsCode2.Text);
+                Properties.Settings.Default.Inst_Name1= tInsName1.Text;
+                Properties.Settings.Default.Inst_Name2= tInsName2.Text;
                 Properties.Settings.Default.Save();
                 Properties.Settings.Default.Reload();
                 tComPort.Text = Properties.Settings.Default.comport.ToString();
@@ -43,6 +47,10 @@ namespace eDosStation
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
             tComPort.Text = Properties.Settings.Default.comport.ToString();
+            tInsCode1.Text = Properties.Settings.Default.Inst_CODE1.ToString();
+            tInsCode2.Text = Properties.Settings.Default.Inst_CODE2.ToString();
+            tInsName1.Text = Properties.Settings.Default.Inst_Name1.ToString();
+            tInsName2.Text = Properties.Settings.Default.Inst_Name2.ToString();
         }
     }
 }