diff --git a/RFiDGear/DataAccessLayer/Remote/FromIO/RFiDDevice.cs b/RFiDGear/DataAccessLayer/Remote/FromIO/RFiDDevice.cs
index c0f5f8c..bdd5b5a 100644
--- a/RFiDGear/DataAccessLayer/Remote/FromIO/RFiDDevice.cs
+++ b/RFiDGear/DataAccessLayer/Remote/FromIO/RFiDDevice.cs
@@ -414,7 +414,7 @@ public ERROR ReadMiFareClassicSingleSector(int sectorNumber, string aKey, string
                             }
                             catch
                             {
-                                return ERROR.NoError;
+                                return ERROR.AuthenticationError;
                             }
                             return ERROR.NoError;
                         }
@@ -705,7 +705,8 @@ public ERROR ReadMiFareClassicSingleBlock(int _blockNumber, string _aKey, string
 
         public ERROR WriteMiFareClassicWithMAD(int _madApplicationID, int _madStartSector,
                                                string _aKeyToUse, string _bKeyToUse, string _aKeyToWrite, string _bKeyToWrite,
-                                               byte[] buffer, byte _madGPB, bool _useMADToAuth = false, bool _keyToWriteUseMAD = false)
+                                               string _madAKeyToUse, string _madBKeyToUse, string _madAKeyToWrite, string _madBKeyToWrite,
+                                               byte[] buffer, byte _madGPB, SectorAccessBits _sab, bool _useMADToAuth = false, bool _keyToWriteUseMAD = false)
         {
             var settings = new SettingsReaderWriter();
             Sector = new MifareClassicSectorModel();
@@ -718,11 +719,11 @@ public ERROR WriteMiFareClassicWithMAD(int _madApplicationID, int _madStartSecto
             var mAKeyToWrite = new MifareKey() { Value = CustomConverter.KeyFormatQuickCheck(_aKeyToWrite) ? _aKeyToWrite : CustomConverter.FormatMifareClassicKeyWithSpacesEachByte(_aKeyToWrite) };
             var mBKeyToWrite = new MifareKey() { Value = CustomConverter.KeyFormatQuickCheck(_bKeyToWrite) ? _bKeyToWrite : CustomConverter.FormatMifareClassicKeyWithSpacesEachByte(_bKeyToWrite) };
 
-            var madAKeyToUse = mAKeyToUse;
-            var madBKeyToUse = mBKeyToUse;
+            var madAKeyToUse = new MifareKey() { Value = CustomConverter.KeyFormatQuickCheck(_madAKeyToUse) ? _madAKeyToUse : CustomConverter.FormatMifareClassicKeyWithSpacesEachByte(_madAKeyToUse) };
+            var madBKeyToUse = new MifareKey() { Value = CustomConverter.KeyFormatQuickCheck(_madBKeyToUse) ? _madBKeyToUse : CustomConverter.FormatMifareClassicKeyWithSpacesEachByte(_madBKeyToUse) };
 
-            var madAKeyToWrite = mAKeyToWrite;
-            var madBKeyToWrite = mBKeyToWrite;
+            var madAKeyToWrite = new MifareKey() { Value = CustomConverter.KeyFormatQuickCheck(_madAKeyToWrite) ? _madAKeyToWrite : CustomConverter.FormatMifareClassicKeyWithSpacesEachByte(_madAKeyToWrite) };
+            var madBKeyToWrite = new MifareKey() { Value = CustomConverter.KeyFormatQuickCheck(_madBKeyToWrite) ? _madBKeyToWrite : CustomConverter.FormatMifareClassicKeyWithSpacesEachByte(_madBKeyToWrite) };
 
             try
             {
@@ -757,13 +758,15 @@ public ERROR WriteMiFareClassicWithMAD(int _madApplicationID, int _madStartSecto
 
                             MifareAccessInfo aiToWrite = new MifareAccessInfoClass
                             {
-                                UseMAD = _keyToWriteUseMAD
+                                UseMAD = _keyToWriteUseMAD,
+                                
                             };
-                            aiToWrite.MADKeyA.Value = _aKeyToUse == _aKeyToWrite ? madAKeyToUse.Value : madAKeyToWrite.Value;
-                            aiToWrite.MADKeyB.Value = _bKeyToUse == _bKeyToWrite ? madBKeyToUse.Value : madBKeyToWrite.Value;
+                            aiToWrite.MADKeyA.Value = _aKeyToUse == _madAKeyToWrite ? madAKeyToUse.Value : madAKeyToWrite.Value;
+                            aiToWrite.MADKeyB.Value = _bKeyToUse == _madBKeyToWrite ? madBKeyToUse.Value : madBKeyToWrite.Value;
                             aiToWrite.KeyA.Value = _aKeyToUse == _aKeyToWrite ? mAKeyToUse.Value : mAKeyToWrite.Value;
                             aiToWrite.KeyB.Value = _bKeyToUse == _bKeyToWrite ? mBKeyToUse.Value : mBKeyToWrite.Value;
                             aiToWrite.MADGPB = _madGPB;
+                            aiToWrite.SAB = _sab;
 
                             var aiToUse = new MifareAccessInfoClass
                             {
@@ -804,7 +807,7 @@ public ERROR WriteMiFareClassicWithMAD(int _madApplicationID, int _madStartSecto
             return ERROR.NoError;
         }
 
-        public ERROR ReadMiFareClassicWithMAD(int madApplicationID, string _aKeyToUse, string _bKeyToUse, int _length, byte _madGPB, bool _useMADToAuth = true, bool _aiToUseIsMAD = false)
+        public ERROR ReadMiFareClassicWithMAD(int madApplicationID, string _aKeyToUse, string _bKeyToUse, string _madAKeyToUse, string _madBKeyToUse, int _length, byte _madGPB, bool _useMADToAuth = true, bool _aiToUseIsMAD = false)
         {
             var settings = new SettingsReaderWriter();
             Sector = new MifareClassicSectorModel();
@@ -814,8 +817,8 @@ public ERROR ReadMiFareClassicWithMAD(int madApplicationID, string _aKeyToUse, s
             var mAKeyToUse = new MifareKey() { Value = CustomConverter.KeyFormatQuickCheck(_aKeyToUse) ? _aKeyToUse : CustomConverter.FormatMifareClassicKeyWithSpacesEachByte(_aKeyToUse) };
             var mBKeyToUse = new MifareKey() { Value = CustomConverter.KeyFormatQuickCheck(_bKeyToUse) ? _bKeyToUse : CustomConverter.FormatMifareClassicKeyWithSpacesEachByte(_bKeyToUse) };
 
-            var madAKeyToUse = mAKeyToUse;
-            var madBKeyToUse = mBKeyToUse;
+            var madAKeyToUse = new MifareKey() { Value = CustomConverter.KeyFormatQuickCheck(_madAKeyToUse) ? _madAKeyToUse : CustomConverter.FormatMifareClassicKeyWithSpacesEachByte(_madAKeyToUse) };
+            var madBKeyToUse = new MifareKey() { Value = CustomConverter.KeyFormatQuickCheck(_madBKeyToUse) ? _madBKeyToUse : CustomConverter.FormatMifareClassicKeyWithSpacesEachByte(_madBKeyToUse) };
 
             try
             {
diff --git a/RFiDGear/Model/MifareClassic/MifareClassicSectorModel.cs b/RFiDGear/Model/MifareClassic/MifareClassicSectorModel.cs
index 4189e39..b39532e 100644
--- a/RFiDGear/Model/MifareClassic/MifareClassicSectorModel.cs
+++ b/RFiDGear/Model/MifareClassic/MifareClassicSectorModel.cs
@@ -225,6 +225,9 @@ public string AccessBitsAsString
         public AccessCondition_MifareClassicSectorTrailer Read_KeyB { get => SectorAccessCondition.Read_KeyB; set => SectorAccessCondition.Read_KeyB = value; }
         public AccessCondition_MifareClassicSectorTrailer Write_KeyB { get => SectorAccessCondition.Read_KeyB; set => SectorAccessCondition.Read_KeyB = value; }
 
+        public LibLogicalAccess.SectorAccessBits SAB { get => sab; set => sab = value; }
+        private LibLogicalAccess.SectorAccessBits sab;
+
         public bool IsAuthenticated { get; set; }
         public short Cx { get => SectorAccessCondition.Cx; set => SectorAccessCondition.Cx = value; }
 
@@ -240,8 +243,6 @@ private bool decodeSectorTrailer(byte[] st, ref MifareClassicSectorModel _sector
         {
             uint C1x, C2x;
 
-            LibLogicalAccess.SectorAccessBits sab;
-
             uint tmpAccessBitCx;
 
             if (CustomConverter.SectorTrailerHasWrongFormat(st))
@@ -468,9 +469,13 @@ private string encodeSectorTrailer(MifareClassicSectorModel _sector)
 
             // DataBlock 0 = C1/0; C2/0; C3/0
 
-            st[1] |= (byte)((dataBlock0AccessBitsIndex & 0x01) << 4);   // C1/0
-            st[2] |= (byte)((dataBlock0AccessBitsIndex & 0x02) >> 1);   // C2/0
-            st[2] |= (byte)((dataBlock0AccessBitsIndex & 0x04) << 2);   // C3/0
+            st[1] |= (byte)((dataBlock0AccessBitsIndex & 0x0001) << 4);   // C1/0
+            st[2] |= (byte)((dataBlock0AccessBitsIndex & 0x0002) >> 1);   // C2/0
+            st[2] |= (byte)((dataBlock0AccessBitsIndex & 0x0004) << 2);   // C3/0
+
+            sab.d_data_block0_access_bits.c1 |= (short)(dataBlock0AccessBitsIndex & 0x0001);
+            sab.d_data_block0_access_bits.c2 |= (short)((dataBlock0AccessBitsIndex & 0x0002) >> 1);
+            sab.d_data_block0_access_bits.c3 |= (short)((dataBlock0AccessBitsIndex & 0x0004) >> 2);
 
             // DataBlock 1 = C1/1; C2/1; C3/1
 
@@ -478,18 +483,30 @@ private string encodeSectorTrailer(MifareClassicSectorModel _sector)
             st[2] |= (byte)(dataBlock1AccessBitsIndex & 0x02);          // C2/1
             st[2] |= (byte)((dataBlock1AccessBitsIndex & 0x04) << 3);   // C3/1
 
+            sab.d_data_block1_access_bits.c1 |= (short)(dataBlock1AccessBitsIndex & 0x01);
+            sab.d_data_block1_access_bits.c2 |= (short)((dataBlock1AccessBitsIndex & 0x02) >> 1);
+            sab.d_data_block1_access_bits.c3 |= (short)((dataBlock1AccessBitsIndex & 0x04) >> 2);
+
             // DataBlock 2 = C1/2; C2/2; C3/2
 
             st[1] |= (byte)((dataBlock2AccessBitsIndex & 0x01) << 6);   // C1/2
             st[2] |= (byte)((dataBlock2AccessBitsIndex & 0x02) << 1);   // C2/2
             st[2] |= (byte)((dataBlock2AccessBitsIndex & 0x04) << 4);   // C3/2
 
+            sab.d_data_block2_access_bits.c1 |= (short)(dataBlock2AccessBitsIndex & 0x01);
+            sab.d_data_block2_access_bits.c2 |= (short)((dataBlock2AccessBitsIndex & 0x02) >> 1);
+            sab.d_data_block2_access_bits.c3 |= (short)((dataBlock2AccessBitsIndex & 0x04) >> 2);
+
             // SectorAccessBits = C1/3; C2/3; C3/3
 
             st[1] |= (byte)((sectorAccessBitsIndex & 0x01) << 7);   // C1/3
             st[2] |= (byte)((sectorAccessBitsIndex & 0x02) << 2);   // C2/3
             st[2] |= (byte)((sectorAccessBitsIndex & 0x04) << 5);   // C3/3
 
+            sab.d_sector_trailer_access_bits.c1 |= (short)(sectorAccessBitsIndex & 0x01);
+            sab.d_sector_trailer_access_bits.c2 |= (short)((sectorAccessBitsIndex & 0x02) >> 1);
+            sab.d_sector_trailer_access_bits.c3 |= (short)((sectorAccessBitsIndex & 0x04) >> 2);
+
             st = CustomConverter.buildSectorTrailerInvNibble(st);
             string[] stAsString;
 
diff --git a/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicTaskTabPages/TabPageMifareClassicKeySetupView.xaml b/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicTaskTabPages/TabPageMifareClassicKeySetupView.xaml
index 93be74d..d6f458c 100644
--- a/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicTaskTabPages/TabPageMifareClassicKeySetupView.xaml
+++ b/RFiDGear/View/TaskViews/RFIDTasks/MifareClassicTask/MifareClassicTaskTabPages/TabPageMifareClassicKeySetupView.xaml
@@ -42,99 +42,204 @@
                 IsEnabled="{Binding IsClassicAuthInfoEnabled}">
                 <Grid IsEnabled="True">
                     <Label
-                        Margin="10,3,10,7"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        Content="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='labelContentMifareClassicSetupKeyBValue'}" Grid.Column="2" Grid.Row="1" />
-                    <TextBox
                         Grid.Row="1"
-                        Grid.Column="3"
-                        Margin="10,3,5,7"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        HorizontalContentAlignment="Left"
-                        VerticalContentAlignment="Center"
-                        FontFamily="Lucida Console"
-                        Text="{Binding ClassicKeyBKeyCurrent, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}">
-                        <TextBox.Resources>
-                            <Style TargetType="TextBox">
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding IsValidClassicKeyBKeyCurrent}" Value="True">
-                                        <Setter Property="Foreground" Value="Green" />
-                                        <Setter Property="Background" Value="White" />
-                                        <Setter Property="FontWeight" Value="Normal" />
-                                    </DataTrigger>
-                                    <DataTrigger Binding="{Binding IsValidClassicKeyBKeyCurrent}" Value="False">
-                                        <Setter Property="Foreground" Value="Black" />
-                                        <Setter Property="Background" Value="Red" />
-                                        <Setter Property="FontWeight" Value="Normal" />
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </TextBox.Resources>
-                    </TextBox>
-                    <Label
-                        Grid.Row="1"
-                        Grid.Column="0"
-                        Margin="8,3,7,7"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        Content="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='labelContentMifareClassicSetupKeyAValue'}" />
-                    <TextBox
-                        Grid.Row="1"
-                        Grid.Column="1"
-                        Margin="9,3,10,7"
-                        HorizontalAlignment="Stretch"
-                        VerticalAlignment="Stretch"
-                        HorizontalContentAlignment="Left"
-                        VerticalContentAlignment="Center"
-                        FontFamily="Lucida Console"
-                        Text="{Binding ClassicKeyAKeyCurrent, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}">
-                        <TextBox.Resources>
-                            <Style TargetType="TextBox">
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding IsValidClassicKeyAKeyCurrent}" Value="True">
-                                        <Setter Property="Foreground" Value="Green" />
-                                        <Setter Property="Background" Value="White" />
-                                        <Setter Property="FontWeight" Value="Normal" />
-                                    </DataTrigger>
-                                    <DataTrigger Binding="{Binding IsValidClassicKeyAKeyCurrent}" Value="False">
-                                        <Setter Property="Foreground" Value="Black" />
-                                        <Setter Property="Background" Value="Red" />
-                                        <Setter Property="FontWeight" Value="Normal" />
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </TextBox.Resources>
-                    </TextBox>
-                    <Label
-                        Grid.Row="0"
                         Grid.Column="0"
                         Height="26"
-                        Margin="8,8,8,8"
+                        Margin="8,3.5,8,9"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
                         Content="{Binding LocalizationResourceSet, Converter={StaticResource Localization}, ConverterParameter='labelContentMifareClassicSetupSectorNumber'}" />
                     <ComboBox
-                        Grid.Row="0"
+                        Grid.Row="1"
                         Grid.Column="1"
-                        Margin="10,10,10,6"
-                        HorizontalAlignment="Stretch"
+                        Width="119"
+                        Margin="10,5,0,6"
+                        HorizontalAlignment="Left"
                         VerticalAlignment="Stretch"
                         IsEnabled="{Binding IsFixedKeyNumber}"
                         ItemsSource="{Binding MifareClassicKeys}"
                         SelectedItem="{Binding SelectedClassicSectorCurrent, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
-                    <Button
+                    <GroupBox
                         Grid.Row="2"
+                        Grid.RowSpan="2"
                         Grid.Column="0"
-                        Grid.ColumnSpan="4"
-                        Height="23"
-                        Margin="10,3,5,0"
+                        Grid.ColumnSpan="2"
+                        Margin="8,0,6,-28"
                         HorizontalAlignment="Stretch"
-                        Command="{Binding ReadDataCommand}"
-                        Content="Read" VerticalAlignment="Top" />
+                        VerticalAlignment="Stretch"
+                        Header="SectorKey - Current">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="42" />
+                                <RowDefinition Height="36" />
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="110.554888163972" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Label
+                                Grid.Row="0"
+                                Grid.Column="0"
+                                Margin="8,8,7,8"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Content="{Binding LocalizationResourceSet, ConverterParameter=labelContentMifareClassicSetupKeyAValue, Converter={StaticResource Localization}}" />
+                            <Label
+                                Grid.Row="1"
+                                Grid.Column="0"
+                                Margin="8,3,7,7"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Content="{Binding LocalizationResourceSet, ConverterParameter=labelContentMifareClassicSetupKeyBValue, Converter={StaticResource Localization}}" />
+                            <TextBox
+                                Grid.Row="0"
+                                Grid.Column="1"
+                                Margin="9,8,7,8"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                HorizontalContentAlignment="Left"
+                                VerticalContentAlignment="Center"
+                                FontFamily="Lucida Console"
+                                Text="{Binding ClassicKeyAKeyCurrent, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                                <TextBox.Resources>
+                                    <Style TargetType="{x:Type TextBox}">
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding IsValidClassicKeyAKeyCurrent}" Value="True">
+                                                <Setter Property="Foreground" Value="Green" />
+                                                <Setter Property="Background" Value="White" />
+                                                <Setter Property="FontWeight" Value="Normal" />
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding IsValidClassicKeyAKeyCurrent}" Value="False">
+                                                <Setter Property="Foreground" Value="Black" />
+                                                <Setter Property="Background" Value="Red" />
+                                                <Setter Property="FontWeight" Value="Normal" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBox.Resources>
+                            </TextBox>
+                            <TextBox
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                Margin="9,3,7,7"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                HorizontalContentAlignment="Left"
+                                VerticalContentAlignment="Center"
+                                FontFamily="Lucida Console"
+                                Text="{Binding ClassicKeyBKeyCurrent, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                                <TextBox.Resources>
+                                    <Style TargetType="{x:Type TextBox}">
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding IsValidClassicKeyBKeyCurrent}" Value="True">
+                                                <Setter Property="Foreground" Value="Green" />
+                                                <Setter Property="Background" Value="White" />
+                                                <Setter Property="FontWeight" Value="Normal" />
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding IsValidClassicKeyBKeyCurrent}" Value="False">
+                                                <Setter Property="Foreground" Value="Black" />
+                                                <Setter Property="Background" Value="Red" />
+                                                <Setter Property="FontWeight" Value="Normal" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBox.Resources>
+                            </TextBox>
+                        </Grid>
+                    </GroupBox>
+                    <GroupBox
+                        Grid.Row="2"
+                        Grid.RowSpan="2"
+                        Grid.Column="2"
+                        Grid.ColumnSpan="2"
+                        Margin="10,0,10,-27"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        Header="SectorKey - Target">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="42" />
+                                <RowDefinition Height="36" />
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="110.554888163972" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Label
+                                Grid.Row="0"
+                                Grid.Column="0"
+                                Margin="8,8,7,8"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Content="{Binding LocalizationResourceSet, ConverterParameter=labelContentMifareClassicSetupKeyAValue, Converter={StaticResource Localization}}" />
+                            <Label
+                                Grid.Row="1"
+                                Grid.Column="0"
+                                Margin="8,3,7,7"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                Content="{Binding LocalizationResourceSet, ConverterParameter=labelContentMifareClassicSetupKeyBValue, Converter={StaticResource Localization}}" />
+                            <TextBox
+                                Grid.Row="0"
+                                Grid.Column="1"
+                                Margin="9,8,7,8"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                HorizontalContentAlignment="Left"
+                                VerticalContentAlignment="Center"
+                                FontFamily="Lucida Console"
+                                Text="{Binding ClassicKeyAKeyTarget, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                                <TextBox.Resources>
+                                    <Style TargetType="{x:Type TextBox}">
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding IsValidClassicKeyAKeyTarget}" Value="True">
+                                                <Setter Property="Foreground" Value="Green" />
+                                                <Setter Property="Background" Value="White" />
+                                                <Setter Property="FontWeight" Value="Normal" />
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding IsValidClassicKeyAKeyTarget}" Value="False">
+                                                <Setter Property="Foreground" Value="Black" />
+                                                <Setter Property="Background" Value="Red" />
+                                                <Setter Property="FontWeight" Value="Normal" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBox.Resources>
+                            </TextBox>
+                            <TextBox
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                Margin="9,3,7,7"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Stretch"
+                                HorizontalContentAlignment="Left"
+                                VerticalContentAlignment="Center"
+                                FontFamily="Lucida Console"
+                                Text="{Binding ClassicKeyBKeyTarget, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                                <TextBox.Resources>
+                                    <Style TargetType="{x:Type TextBox}">
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding IsValidClassicKeyBKeyTarget}" Value="True">
+                                                <Setter Property="Foreground" Value="Green" />
+                                                <Setter Property="Background" Value="White" />
+                                                <Setter Property="FontWeight" Value="Normal" />
+                                            </DataTrigger>
+                                            <DataTrigger Binding="{Binding IsValidClassicKeyBKeyTarget}" Value="False">
+                                                <Setter Property="Foreground" Value="Black" />
+                                                <Setter Property="Background" Value="Red" />
+                                                <Setter Property="FontWeight" Value="Normal" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </TextBox.Resources>
+                            </TextBox>
+                        </Grid>
+                    </GroupBox>
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="42" />
+                        <RowDefinition Height="4.5" />
+                        <RowDefinition Height="38.5" />
                         <RowDefinition Height="36" />
                         <RowDefinition Height="36" />
 
@@ -147,23 +252,26 @@
                     </Grid.ColumnDefinitions>
                 </Grid>
             </GroupBox>
-            <GroupBox Header="MAD Setup" 
-                      Height="60" Margin="8,0,8,0" 
-                      Grid.Row="1" 
-                      VerticalAlignment="Top">
+            <GroupBox
+                Grid.Row="1"
+                Height="65"
+                Margin="8,0,8,0"
+                VerticalAlignment="Top"
+                Header="MAD Setup">
 
                 <Grid>
                     <CheckBox
+                        Width="81"
                         Height="15"
                         Margin="10,10,0,0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Top"
                         Content="Use MAD"
-                        IsChecked="{Binding UseMAD, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="81" />
+                        IsChecked="{Binding UseMAD, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                     <Label
                         Grid.Row="0"
-                        Height="26"
                         Grid.Column="0"
+                        Height="26"
                         Margin="128,4,0,0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Top"
@@ -179,23 +287,24 @@
                         Grid.Row="0"
                         Width="176"
                         Height="15"
-
+                        Margin="0,10,53,0"
                         HorizontalAlignment="Right"
                         VerticalAlignment="Top"
                         Content="Multi Application"
-                        IsChecked="{Binding IsMultiApplication, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="0,10,53,0" />
+                        IsChecked="{Binding IsMultiApplication, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
 
 
                 </Grid>
             </GroupBox>
             <GroupBox
+                Grid.Row="1"
                 Grid.Column="0"
-                Margin="8,70,8,0"
+                Margin="8,65,8,0"
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch"
                 Header="MAD Access"
-                IsEnabled="{Binding UseMAD}" Grid.Row="1">
-                <!-- Visibility="{Binding UseMAD, Converter={StaticResource BoolToVisConv}, FallbackValue=Visible}" Grid.Row="1"> -->
+                IsEnabled="{Binding UseMAD}">
+                <!--  Visibility="{Binding UseMAD, Converter={StaticResource BoolToVisConv}, FallbackValue=Visible}" Grid.Row="1">  -->
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="180" />
@@ -250,7 +359,7 @@
                             Margin="8,8,7,8"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
-                            Header="Key - Current">
+                            Header="MAD Key - Current">
                             <Grid>
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="42" />
@@ -284,16 +393,16 @@
                                     HorizontalContentAlignment="Left"
                                     VerticalContentAlignment="Center"
                                     FontFamily="Lucida Console"
-                                    Text="{Binding ClassicKeyAKeyCurrent, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                                    Text="{Binding ClassicMADKeyAKeyCurrent, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
                                     <TextBox.Resources>
                                         <Style TargetType="{x:Type TextBox}">
                                             <Style.Triggers>
-                                                <DataTrigger Binding="{Binding IsValidClassicKeyAKeyCurrent}" Value="True">
+                                                <DataTrigger Binding="{Binding IsValidClassicMADKeyAKeyCurrent}" Value="True">
                                                     <Setter Property="Foreground" Value="Green" />
                                                     <Setter Property="Background" Value="White" />
                                                     <Setter Property="FontWeight" Value="Normal" />
                                                 </DataTrigger>
-                                                <DataTrigger Binding="{Binding IsValidClassicKeyAKeyCurrent}" Value="False">
+                                                <DataTrigger Binding="{Binding IsValidClassicMADKeyAKeyCurrent}" Value="False">
                                                     <Setter Property="Foreground" Value="Black" />
                                                     <Setter Property="Background" Value="Red" />
                                                     <Setter Property="FontWeight" Value="Normal" />
@@ -311,16 +420,16 @@
                                     HorizontalContentAlignment="Left"
                                     VerticalContentAlignment="Center"
                                     FontFamily="Lucida Console"
-                                    Text="{Binding ClassicKeyBKeyCurrent, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                                    Text="{Binding ClassicMADKeyBKeyCurrent, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
                                     <TextBox.Resources>
                                         <Style TargetType="{x:Type TextBox}">
                                             <Style.Triggers>
-                                                <DataTrigger Binding="{Binding IsValidClassicKeyBKeyCurrent}" Value="True">
+                                                <DataTrigger Binding="{Binding IsValidClassicMADKeyBKeyCurrent}" Value="True">
                                                     <Setter Property="Foreground" Value="Green" />
                                                     <Setter Property="Background" Value="White" />
                                                     <Setter Property="FontWeight" Value="Normal" />
                                                 </DataTrigger>
-                                                <DataTrigger Binding="{Binding IsValidClassicKeyBKeyCurrent}" Value="False">
+                                                <DataTrigger Binding="{Binding IsValidClassicMADKeyBKeyCurrent}" Value="False">
                                                     <Setter Property="Foreground" Value="Black" />
                                                     <Setter Property="Background" Value="Red" />
                                                     <Setter Property="FontWeight" Value="Normal" />
@@ -337,7 +446,7 @@
                             Margin="8,8,8,8"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Stretch"
-                            Header="Key - Target">
+                            Header="MAD Key - Target">
                             <Grid>
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="42" />
@@ -371,16 +480,16 @@
                                     HorizontalContentAlignment="Left"
                                     VerticalContentAlignment="Center"
                                     FontFamily="Lucida Console"
-                                    Text="{Binding ClassicKeyAKeyTarget, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                                    Text="{Binding ClassicMADKeyAKeyTarget, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
                                     <TextBox.Resources>
                                         <Style TargetType="{x:Type TextBox}">
                                             <Style.Triggers>
-                                                <DataTrigger Binding="{Binding IsValidClassicKeyAKeyTarget}" Value="True">
+                                                <DataTrigger Binding="{Binding IsValidClassicMADKeyAKeyTarget}" Value="True">
                                                     <Setter Property="Foreground" Value="Green" />
                                                     <Setter Property="Background" Value="White" />
                                                     <Setter Property="FontWeight" Value="Normal" />
                                                 </DataTrigger>
-                                                <DataTrigger Binding="{Binding IsValidClassicKeyAKeyTarget}" Value="False">
+                                                <DataTrigger Binding="{Binding IsValidClassicMADKeyAKeyTarget}" Value="False">
                                                     <Setter Property="Foreground" Value="Black" />
                                                     <Setter Property="Background" Value="Red" />
                                                     <Setter Property="FontWeight" Value="Normal" />
@@ -398,16 +507,16 @@
                                     HorizontalContentAlignment="Left"
                                     VerticalContentAlignment="Center"
                                     FontFamily="Lucida Console"
-                                    Text="{Binding ClassicKeyBKeyTarget, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                                    Text="{Binding ClassicMADKeyBKeyTarget, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
                                     <TextBox.Resources>
                                         <Style TargetType="{x:Type TextBox}">
                                             <Style.Triggers>
-                                                <DataTrigger Binding="{Binding IsValidClassicKeyBKeyTarget}" Value="True">
+                                                <DataTrigger Binding="{Binding IsValidClassicMADKeyBKeyTarget}" Value="True">
                                                     <Setter Property="Foreground" Value="Green" />
                                                     <Setter Property="Background" Value="White" />
                                                     <Setter Property="FontWeight" Value="Normal" />
                                                 </DataTrigger>
-                                                <DataTrigger Binding="{Binding IsValidClassicKeyBKeyTarget}" Value="False">
+                                                <DataTrigger Binding="{Binding IsValidClassicMADKeyBKeyTarget}" Value="False">
                                                     <Setter Property="Foreground" Value="Black" />
                                                     <Setter Property="Background" Value="Red" />
                                                     <Setter Property="FontWeight" Value="Normal" />
@@ -431,8 +540,8 @@
                         IsChecked="{Binding UseMadAuth, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                     <Label
                         Grid.Column="2"
-                        Margin="10,8,6,2"
                         Height="26"
+                        Margin="10,8,6,2"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Stretch"
                         Content="Size" />
@@ -466,8 +575,8 @@
                     <TextBox
                         Grid.Row="0"
                         Grid.Column="1"
-                        Margin="10,8,10,0"
                         Height="21"
+                        Margin="10,8,10,0"
                         HorizontalAlignment="Stretch"
                         VerticalAlignment="Top"
                         HorizontalContentAlignment="Left"
@@ -493,7 +602,7 @@
                 </Grid>
             </GroupBox>
             <Grid.RowDefinitions>
-                <RowDefinition Height="140" />
+                <RowDefinition Height="180" />
                 <RowDefinition />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
diff --git a/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipChildLayerViewModel.cs b/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipChildLayerViewModel.cs
index d4d7cfb..1aa8050 100644
--- a/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipChildLayerViewModel.cs
+++ b/RFiDGear/ViewModel/HirarchicalDataTemplateViewModels/RFiDChipChildLayerViewModel.cs
@@ -445,6 +445,33 @@ public string ChildNodeHeader
 
         #endregion
 
+        #region ChipProperties
+
+        /// <summary>
+        ///
+        /// </summary>
+        public MifareClassicSectorModel SectorModel
+        {
+            get => sectorModel;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public MifareDesfireAppModel AppModel
+        {
+            get => appModel;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        public MifareUltralightPageModel PageModel
+        {
+            get => pageModel;
+        }
+
+        #endregion
         private void LoadChildren()
         {
             switch (_cardType)
diff --git a/RFiDGear/ViewModel/TaskSetupViewModels/MifareClassicSetupViewModel.cs b/RFiDGear/ViewModel/TaskSetupViewModels/MifareClassicSetupViewModel.cs
index 70e4cb0..73a997d 100644
--- a/RFiDGear/ViewModel/TaskSetupViewModels/MifareClassicSetupViewModel.cs
+++ b/RFiDGear/ViewModel/TaskSetupViewModels/MifareClassicSetupViewModel.cs
@@ -341,6 +341,7 @@ public SectorTrailer_DataBlock Selected_DataBlockType
             set
             {
                 selected_DataBlockType = value;
+
                 RaisePropertyChanged("Selected_DataBlock_AccessCondition");
                 RaisePropertyChanged("Selected_DataBlockType");
             }
@@ -867,14 +868,10 @@ public bool UseMAD
 
                     ChildNodeViewModelTemp.Children.Add(new RFiDChipGrandChildLayerViewModel(new MifareClassicMADModel(0, 1), this));
 
-                    FileSize = "100";
-
-                    IsClassicAuthInfoEnabled = false;
+                    FileSize = "48";
                 }
                 else
                 {
-                    IsClassicAuthInfoEnabled = true;
-
                     ChildNodeViewModelTemp.Children.Clear();
                     ChildNodeViewModelFromChip.Children.Clear();
 
@@ -1143,7 +1140,10 @@ public string SelectedClassicSectorCurrent
                         childNodeViewModelTemp = new RFiDChipChildLayerViewModel(sectorModel, null, CARD_TYPE.Mifare4K, null, true);
 
                     }
-
+                    else
+                    {
+                        sectorModel.SectorNumber = selectedClassicSectorCurrentAsInt;
+                    }
                     RaisePropertyChanged("SelectedClassicSectorCurrent");
                 }
             }
@@ -1619,7 +1619,7 @@ private protected void OnNewReadDataCommand()
                                          ChildNodeViewModelTemp.Children.FirstOrDefault().MifareClassicMAD.MADApp = appNumberAsInt;
 
                                          if (device.ReadMiFareClassicWithMAD(appNumberAsInt,
-                                             ClassicKeyAKeyCurrent, ClassicKeyBKeyCurrent, fileSizeAsInt,
+                                             ClassicKeyAKeyCurrent, ClassicKeyBKeyCurrent, ClassicMADKeyAKeyCurrent, ClassicMADKeyBKeyCurrent, fileSizeAsInt,
                                              madGPB, UseMAD, useMADAuth) == ERROR.NoError)
                                          {
                                              ChildNodeViewModelFromChip.Children.FirstOrDefault().MifareClassicMAD.Data = device.MifareClassicData;
@@ -1724,12 +1724,14 @@ private protected void OnNewWriteDataCommand()
                                  {
                                      ChildNodeViewModelFromChip.Children.FirstOrDefault().MifareClassicMAD.MADApp = appNumberAsInt;
                                      ChildNodeViewModelTemp.Children.FirstOrDefault().MifareClassicMAD.MADApp = appNumberAsInt;
-
+                                     
                                      if (device.WriteMiFareClassicWithMAD(appNumberAsInt, selectedMADSectorAsInt,
                                                                           ClassicKeyAKeyCurrent, ClassicKeyBKeyCurrent,
                                                                           ClassicKeyAKeyTarget, ClassicKeyBKeyTarget,
+                                                                          ClassicMADKeyAKeyCurrent, ClassicMADKeyBKeyCurrent,
+                                                                          ClassicMADKeyAKeyTarget, ClassicMADKeyBKeyTarget,
                                                                           ChildNodeViewModelTemp.Children.Single(x => x.MifareClassicMAD.MADApp == appNumberAsInt).MifareClassicMAD.Data,
-                                                                          madGPB, UseMadAuth, UseMAD) == ERROR.NoError)
+                                                                          madGPB, ChildNodeViewModelTemp.SectorModel.SAB, UseMadAuth, UseMAD) == ERROR.NoError)
                                      {
                                          StatusText = StatusText + string.Format("{0}: Wrote {1} bytes to MAD ID {2}\n", DateTime.Now,
                                              ChildNodeViewModelTemp.Children.Single(x => x.MifareClassicMAD.MADApp == appNumberAsInt).MifareClassicMAD.Data.Length,