diff --git a/Application.xaml.vb b/Application.xaml.vb
index e556d2e..221308d 100644
--- a/Application.xaml.vb
+++ b/Application.xaml.vb
@@ -103,6 +103,7 @@ Class Application
    Friend Const REVOLVE As String = "Revolve"
    Friend Const SCREW As String = "Screw"
    Friend Const RULED As String = "Ruled"
+   Friend Const SWEPT As String = "Swept"
    Friend Const MERGESURF As String = "MergeSurf"
    Friend Const EXPLODESURF As String = "ExplodeSurf"
    Friend Const INVERTSURF As String = "InvertSurf"
diff --git a/DrawPanel/DrawPanelV.xaml b/DrawPanel/DrawPanelV.xaml
index 6ec3d7b..63a8225 100644
--- a/DrawPanel/DrawPanelV.xaml
+++ b/DrawPanel/DrawPanelV.xaml
@@ -109,6 +109,11 @@
                Command="{Binding ScrewCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
                <Image Source="/Resources/DrawPanel/Screw.png" Stretch="Uniform"/>
             </Button>
+            <Button ToolTip="{Binding SweptToolTip}" Style="{StaticResource DrawPanelButton}"
+               ToolTipService.ShowOnDisabled="True"
+               Command="{Binding SweptCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
+               <Image Source="/Resources/DrawPanel/Swept.png" Stretch="Uniform"/>
+            </Button>
             <Button ToolTip="{Binding RuledToolTip}" Style="{StaticResource DrawPanelButton}"
                ToolTipService.ShowOnDisabled="True"
                Command="{Binding RuledCommand}" IsEnabled="{Binding bLayerOkAndSelOk}">
diff --git a/DrawPanel/DrawPanelVM.vb b/DrawPanel/DrawPanelVM.vb
index 5e13364..72247ba 100644
--- a/DrawPanel/DrawPanelVM.vb
+++ b/DrawPanel/DrawPanelVM.vb
@@ -126,6 +126,11 @@ Public Class DrawPanelVM
          Return EgtMsg(MSG_DRAWPANEL + 18)
       End Get
    End Property
+   Public ReadOnly Property SweptToolTip As String
+      Get
+         Return EgtMsg(MSG_DRAWPANEL + 48)
+      End Get
+   End Property
    Public ReadOnly Property RuledToolTip As String
       Get
          Return EgtMsg(MSG_DRAWPANEL + 19)
@@ -355,6 +360,7 @@ Public Class DrawPanelVM
    Private m_cmdExtrude As ICommand
    Private m_cmdRevolve As ICommand
    Private m_cmdScrew As ICommand
+   Private m_cmdSwept As ICommand
    Private m_cmdRuled As ICommand
    Private m_cmdMergeSurf As ICommand
    Private m_cmdExplodeSurf As ICommand
@@ -847,6 +853,29 @@ Public Class DrawPanelVM
 
 #End Region ' ScrewCommand
 
+#Region "SweptCommand"
+
+   ''' <summary>
+   ''' Returns a command that do Swept.
+   ''' </summary>
+   Public ReadOnly Property SweptCommand As ICommand
+      Get
+         If m_cmdSwept Is Nothing Then
+            m_cmdSwept = New RelayCommand(AddressOf Swept)
+         End If
+         Return m_cmdSwept
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Ruled.  This method is invoked by the SweptCommand.
+   ''' </summary>
+   Public Sub Swept(ByVal param As Object)
+      Map.refProjectVM.GetController.ExecuteCommand(Controller.CMD.SWEPT)
+   End Sub
+
+#End Region ' SweptCommand
+
 #Region "RuledCommand"
 
    ''' <summary>
diff --git a/EgtCAM5.vbproj b/EgtCAM5.vbproj
index 2e20019..92bf586 100644
--- a/EgtCAM5.vbproj
+++ b/EgtCAM5.vbproj
@@ -721,6 +721,9 @@
   <ItemGroup>
     <Resource Include="Resources\GridViewPanel\ZoomSel.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\DrawPanel\Swept.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
     <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtCAM5\EgtCAM5R32.exe
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
index 83b0bd1..6ad28b1 100644
--- a/My Project/AssemblyInfo.vb	
+++ b/My Project/AssemblyInfo.vb	
@@ -70,5 +70,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.1.4.3")>
-<Assembly: AssemblyFileVersion("2.1.4.3")>
+<Assembly: AssemblyVersion("2.1.5.1")>
+<Assembly: AssemblyFileVersion("2.1.5.1")>
diff --git a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml
index ddebd40..98ec228 100644
--- a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml
+++ b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderV.xaml
@@ -14,8 +14,10 @@
                </Style.Triggers>
             </Style>
          </StackPanel.Style>
-         <TextBlock Text="{Binding TextBlock}" Margin="5,5,0,5"/>
-         <TextBox Text="{Binding TextBox,UpdateSourceTrigger=PropertyChanged}" Margin="5,0,5,5">
+         <TextBlock Text="{Binding TextBlock}"
+                    Visibility="{Binding TextVisibility}" Margin="5,5,0,5"/>
+         <TextBox Text="{Binding TextBox,UpdateSourceTrigger=PropertyChanged}"
+                  Visibility="{Binding TextVisibility}" Margin="5,0,5,5">
             <TextBox.InputBindings>
                <KeyBinding Key="Enter" Command="{Binding DoneCommand}"/>
                <KeyBinding Key="S" Modifiers="Control" Command="{Binding ShowCommand}"/>
diff --git a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb
index 4bcc267..95275d7 100644
--- a/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb
+++ b/OptionPanel/DrawOptionPanel/InputExpander/InputExpanderVM.vb
@@ -65,6 +65,19 @@ Public Class InputExpanderVM
       End Set
    End Property
 
+   Private m_TextVisibility As Visibility
+   Public Property TextVisibility As Visibility
+      Get
+         Return m_TextVisibility
+      End Get
+      Set(value As Visibility)
+         If value <> m_TextVisibility Then
+            m_TextVisibility = value
+            OnPropertyChanged("TextVisibility")
+         End If
+      End Set
+   End Property
+
    Private m_FocusTextBox As Boolean
    Public Property FocusTextBox As Boolean
       Get
@@ -282,8 +295,11 @@ Public Class InputExpanderVM
 
    Private Sub PrepareInputBox(PrepareInputBoxParam As PrepareInputBoxParam)
       Title = PrepareInputBoxParam.sTitle
-      TextBlock = PrepareInputBoxParam.sLabel
-      TextBox = ""
+      If PrepareInputBoxParam.sLabel <> "" Then
+         TextBlock = PrepareInputBoxParam.sLabel
+         TextBox = ""
+         TextVisibility = Visibility.Visible
+      End If
       If PrepareInputBoxParam.sCheckLabel <> "" Then
          CheckBoxText = PrepareInputBoxParam.sCheckLabel
          CheckVisibility = Visibility.Visible
@@ -302,6 +318,7 @@ Public Class InputExpanderVM
 
    Private Sub ResetInputBox()
       Title = EgtMsg(MSG_DRAWOPTION + 5)
+      TextVisibility = Visibility.Collapsed
       CheckVisibility = Visibility.Collapsed
       ComboVisibility = Visibility.Collapsed
       ShowBtnVisibility = Visibility.Collapsed
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
index 9a26b34..5f0b761 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderV.xaml
@@ -360,6 +360,15 @@
                             IsSynchronizedWithCurrentItem="True">
             </ComboBox>
          </UniformGrid>
+         <UniformGrid Columns="2" Visibility="{Binding Type,
+                                                       Converter={StaticResource OperationParamVisibilityConverter},
+                                                       ConverterParameter={StaticResource LeadLinkType}}">
+            <TextBlock Text="{Binding LeadLinkTypeMsg}"/>
+            <ComboBox ItemsSource="{Binding LeadLinkTypeList, Mode=OneWay}"
+                            SelectedIndex="{Binding SelectedLeadLinkType}"
+                            IsSynchronizedWithCurrentItem="True">
+            </ComboBox>
+         </UniformGrid>
          <Expander Visibility="{Binding Type,
                                         Converter={StaticResource OperationParamVisibilityConverter},
                                         ConverterParameter={StaticResource CurveUse}}"
diff --git a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
index 5fde1a0..e237eb5 100644
--- a/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
+++ b/OptionPanel/MachiningOptionPanel/OperationExpander/MachiningParameterExpander/MachiningParameterExpanderVM.vb
@@ -1518,6 +1518,12 @@ Public Class MachiningParameterExpanderVM
       End Get
    End Property
 
+   Public ReadOnly Property LeadLinkTypeMsg As String
+      Get
+         Return EgtMsg(MSG_MACHININGSDBPAGE + 62)
+      End Get
+   End Property
+
    Public ReadOnly Property StepParMsg As String
       Get
          Return EgtMsg(MSG_MACHININGSDBPAGE + 77)
diff --git a/Resources/DrawPanel/Swept.png b/Resources/DrawPanel/Swept.png
new file mode 100644
index 0000000..88f86ee
Binary files /dev/null and b/Resources/DrawPanel/Swept.png differ