diff --git a/configs/sim/gmoccapy/6_axis.ini b/configs/sim/gmoccapy/6_axis.ini
index 8c446d40cb5..e3b084dddd0 100644
--- a/configs/sim/gmoccapy/6_axis.ini
+++ b/configs/sim/gmoccapy/6_axis.ini
@@ -39,7 +39,15 @@ CYCLE_TIME = 0.001
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ./macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ./python
+TOPLEVEL = ./python/toplevel.py
+LOG_LEVEL = 0
 
 [EMCMOT]
 EMCMOT =              motmod
@@ -57,6 +65,9 @@ HALUI = halui
 HALFILE = core_sim_6.hal
 #HALFILE = simulated_home_9.hal
 
+# Single file that is executed after the GUI has started.
+POSTGUI_HALFILE = gmoccapy_postgui.hal
+
 [TRAJ]
 COORDINATES = X Y Z A B C
 LINEAR_UNITS = mm
diff --git a/configs/sim/gmoccapy/7_axis.ini b/configs/sim/gmoccapy/7_axis.ini
index 1655f9d68bf..cbca953f32b 100644
--- a/configs/sim/gmoccapy/7_axis.ini
+++ b/configs/sim/gmoccapy/7_axis.ini
@@ -39,7 +39,15 @@ CYCLE_TIME = 0.001
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ./macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ./python
+TOPLEVEL = ./python/toplevel.py
+LOG_LEVEL = 0
 
 [EMCMOT]
 EMCMOT =              motmod
@@ -57,6 +65,9 @@ HALUI = halui
 HALFILE = core_sim_7.hal
 #HALFILE = simulated_home_9.hal
 
+# Single file that is executed after the GUI has started.
+POSTGUI_HALFILE = gmoccapy_postgui.hal
+
 [TRAJ]
 COORDINATES = X Y Z A B C U
 LINEAR_UNITS = mm
diff --git a/configs/sim/gmoccapy/7_axis_tool.ini b/configs/sim/gmoccapy/7_axis_tool.ini
index 96ad3360d94..f0b16d5cf51 100644
--- a/configs/sim/gmoccapy/7_axis_tool.ini
+++ b/configs/sim/gmoccapy/7_axis_tool.ini
@@ -39,7 +39,15 @@ CYCLE_TIME = 0.001
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ./macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ./python
+TOPLEVEL = ./python/toplevel.py
+LOG_LEVEL = 0
 
 [EMCMOT]
 EMCMOT =              motmod
@@ -57,6 +65,9 @@ HALUI = halui
 HALFILE = core_sim_7.hal
 #HALFILE = simulated_home_9.hal
 
+# Single file that is executed after the GUI has started.
+POSTGUI_HALFILE = gmoccapy_postgui.hal
+
 [TRAJ]
 COORDINATES = X Y Z A B C U
 LINEAR_UNITS = mm
diff --git a/configs/sim/gmoccapy/8_axis.ini b/configs/sim/gmoccapy/8_axis.ini
index 7df628a15a2..e47a36d8f9f 100644
--- a/configs/sim/gmoccapy/8_axis.ini
+++ b/configs/sim/gmoccapy/8_axis.ini
@@ -39,7 +39,18 @@ CYCLE_TIME = 0.001
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ./macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ./python
+TOPLEVEL = ./python/toplevel.py
+LOG_LEVEL = 0
+
+# Single file that is executed after the GUI has started.
+POSTGUI_HALFILE = gmoccapy_postgui.hal
 
 [EMCMOT]
 EMCMOT =              motmod
@@ -56,6 +67,9 @@ TOOL_CHANGE_POSITION = 0 0 2
 HALUI = halui
 HALFILE = core_sim_8.hal
 
+# Single file that is executed after the GUI has started.
+POSTGUI_HALFILE = gmoccapy_postgui.hal
+
 [TRAJ]
 COORDINATES = X Y Z A B C U V
 LINEAR_UNITS = mm
diff --git a/configs/sim/gmoccapy/9_axis.ini b/configs/sim/gmoccapy/9_axis.ini
index 1527517a667..35b07384c05 100644
--- a/configs/sim/gmoccapy/9_axis.ini
+++ b/configs/sim/gmoccapy/9_axis.ini
@@ -39,7 +39,15 @@ CYCLE_TIME = 0.001
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ./macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ./python
+TOPLEVEL = ./python/toplevel.py
+LOG_LEVEL = 0
 
 [EMCMOT]
 EMCMOT =              motmod
@@ -57,6 +65,9 @@ HALUI = halui
 HALFILE = core_sim_9.hal
 #HALFILE = simulated_home_9.hal
 
+# Single file that is executed after the GUI has started.
+POSTGUI_HALFILE = gmoccapy_postgui.hal
+
 [TRAJ]
 COORDINATES = X Y Z A B C U V W
 LINEAR_UNITS = mm
diff --git a/configs/sim/gmoccapy/gmoccapy.ini b/configs/sim/gmoccapy/gmoccapy.ini
index e0dc3bb97d3..bcef6079347 100644
--- a/configs/sim/gmoccapy/gmoccapy.ini
+++ b/configs/sim/gmoccapy/gmoccapy.ini
@@ -54,7 +54,15 @@ py = python3
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ./macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ./python
+TOPLEVEL = ./python/toplevel.py
+LOG_LEVEL = 0
 
 # Motion control section ------------------------------------------------------
 [EMCMOT]
diff --git a/configs/sim/gmoccapy/gmoccapy_4_axis.ini b/configs/sim/gmoccapy/gmoccapy_4_axis.ini
index 84ab39a6669..5fb38f2a668 100644
--- a/configs/sim/gmoccapy/gmoccapy_4_axis.ini
+++ b/configs/sim/gmoccapy/gmoccapy_4_axis.ini
@@ -38,7 +38,15 @@ py = python3
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ./macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ./python
+TOPLEVEL = ./python/toplevel.py
+LOG_LEVEL = 0
 
 # Motion control section ------------------------------------------------------
 [EMCMOT]
diff --git a/configs/sim/gmoccapy/gmoccapy_800x600.ini b/configs/sim/gmoccapy/gmoccapy_800x600.ini
index 18cfcec66a9..5af6728bf66 100644
--- a/configs/sim/gmoccapy/gmoccapy_800x600.ini
+++ b/configs/sim/gmoccapy/gmoccapy_800x600.ini
@@ -56,7 +56,15 @@ py = python3
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ./macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ./python
+TOPLEVEL = ./python/toplevel.py
+LOG_LEVEL = 0
 
 # Motion control section ------------------------------------------------------
 [EMCMOT]
diff --git a/configs/sim/gmoccapy/gmoccapy_XYZAB.ini b/configs/sim/gmoccapy/gmoccapy_XYZAB.ini
index 34d02db78e0..a2fe233e3ac 100644
--- a/configs/sim/gmoccapy/gmoccapy_XYZAB.ini
+++ b/configs/sim/gmoccapy/gmoccapy_XYZAB.ini
@@ -68,7 +68,15 @@ py = python3
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ./macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ./python
+TOPLEVEL = ./python/toplevel.py
+LOG_LEVEL = 0
 
 # Motion control section ------------------------------------------------------
 [EMCMOT]
diff --git a/configs/sim/gmoccapy/gmoccapy_XYZAC.ini b/configs/sim/gmoccapy/gmoccapy_XYZAC.ini
index 83dbe3d6290..a9f633a899c 100644
--- a/configs/sim/gmoccapy/gmoccapy_XYZAC.ini
+++ b/configs/sim/gmoccapy/gmoccapy_XYZAC.ini
@@ -57,7 +57,15 @@ py = python3
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ./macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ./python
+TOPLEVEL = ./python/toplevel.py
+LOG_LEVEL = 0
 
 # Motion control section ------------------------------------------------------
 [EMCMOT]
diff --git a/configs/sim/gmoccapy/gmoccapy_XYZCW.ini b/configs/sim/gmoccapy/gmoccapy_XYZCW.ini
index c0581784871..b66e77f06ae 100644
--- a/configs/sim/gmoccapy/gmoccapy_XYZCW.ini
+++ b/configs/sim/gmoccapy/gmoccapy_XYZCW.ini
@@ -53,7 +53,15 @@ py = python3
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ./macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ./python
+TOPLEVEL = ./python/toplevel.py
+LOG_LEVEL = 0
 
 # Motion control section ------------------------------------------------------
 [EMCMOT]
diff --git a/configs/sim/gmoccapy/gmoccapy_blockdelete.ini b/configs/sim/gmoccapy/gmoccapy_blockdelete.ini
index 3d523748d6d..467abfd83f8 100644
--- a/configs/sim/gmoccapy/gmoccapy_blockdelete.ini
+++ b/configs/sim/gmoccapy/gmoccapy_blockdelete.ini
@@ -54,7 +54,15 @@ py = python3
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ./macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ./python
+TOPLEVEL = ./python/toplevel.py
+LOG_LEVEL = 0
 
 # Motion control section ------------------------------------------------------
 [EMCMOT]
diff --git a/configs/sim/gmoccapy/gmoccapy_left_panel.ini b/configs/sim/gmoccapy/gmoccapy_left_panel.ini
index 3ab04d5cc89..6c41391e2e6 100644
--- a/configs/sim/gmoccapy/gmoccapy_left_panel.ini
+++ b/configs/sim/gmoccapy/gmoccapy_left_panel.ini
@@ -47,7 +47,15 @@ py = python3
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ./macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ./python
+TOPLEVEL = ./python/toplevel.py
+LOG_LEVEL = 0
 
 # Motion control section ------------------------------------------------------
 [EMCMOT]
diff --git a/configs/sim/gmoccapy/gmoccapy_messages.ini b/configs/sim/gmoccapy/gmoccapy_messages.ini
index ad97c93d397..2de9bed0a6e 100644
--- a/configs/sim/gmoccapy/gmoccapy_messages.ini
+++ b/configs/sim/gmoccapy/gmoccapy_messages.ini
@@ -79,7 +79,16 @@ py = python3
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ./macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ./python
+TOPLEVEL = ./python/toplevel.py
+LOG_LEVEL = 0
+
 
 # Motion control section ------------------------------------------------------
 [EMCMOT]
diff --git a/configs/sim/gmoccapy/gmoccapy_pedant.ini b/configs/sim/gmoccapy/gmoccapy_pedant.ini
index 80007b8f918..a55e2a6f67c 100644
--- a/configs/sim/gmoccapy/gmoccapy_pedant.ini
+++ b/configs/sim/gmoccapy/gmoccapy_pedant.ini
@@ -47,7 +47,16 @@ py = python3
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ./macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ./python
+TOPLEVEL = ./python/toplevel.py
+LOG_LEVEL = 0
+
 
 # Motion control section ------------------------------------------------------
 [EMCMOT]
diff --git a/configs/sim/gmoccapy/gmoccapy_pyngcgui.ini b/configs/sim/gmoccapy/gmoccapy_pyngcgui.ini
index 9ffdf310f66..3940b72965f 100644
--- a/configs/sim/gmoccapy/gmoccapy_pyngcgui.ini
+++ b/configs/sim/gmoccapy/gmoccapy_pyngcgui.ini
@@ -84,6 +84,14 @@ RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
 SUBROUTINE_PATH   = macros:../nc_files/ngcgui_lib:../nc_files/ngcgui_lib/utilitysubs
 USER_M_PATH       = ../nc_files/ngcgui_lib/mfiles
 PARAMETER_FILE = sim.var
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ./python
+TOPLEVEL = ./python/toplevel.py
+LOG_LEVEL = 0
 
 # Motion control section ------------------------------------------------------
 [EMCMOT]
diff --git a/configs/sim/gmoccapy/gmoccapy_right_panel.ini b/configs/sim/gmoccapy/gmoccapy_right_panel.ini
index a0bbf8e85a6..6a364e728a0 100644
--- a/configs/sim/gmoccapy/gmoccapy_right_panel.ini
+++ b/configs/sim/gmoccapy/gmoccapy_right_panel.ini
@@ -43,7 +43,15 @@ py = python3
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ./macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ./python
+TOPLEVEL = ./python/toplevel.py
+LOG_LEVEL = 0
 
 # Motion control section ------------------------------------------------------
 [EMCMOT]
diff --git a/configs/sim/gmoccapy/gmoccapy_sim_hardware_button.ini b/configs/sim/gmoccapy/gmoccapy_sim_hardware_button.ini
index 24cfc938cb4..c98a9a1c2b5 100644
--- a/configs/sim/gmoccapy/gmoccapy_sim_hardware_button.ini
+++ b/configs/sim/gmoccapy/gmoccapy_sim_hardware_button.ini
@@ -51,7 +51,15 @@ py = python3
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ./macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ./python
+TOPLEVEL = ./python/toplevel.py
+LOG_LEVEL = 0
 
 # Motion control section ------------------------------------------------------
 [EMCMOT]
diff --git a/configs/sim/gmoccapy/gmoccapy_tool_sensor.ini b/configs/sim/gmoccapy/gmoccapy_tool_sensor.ini
index 524e27ae03c..f00cf2a2850 100644
--- a/configs/sim/gmoccapy/gmoccapy_tool_sensor.ini
+++ b/configs/sim/gmoccapy/gmoccapy_tool_sensor.ini
@@ -80,6 +80,8 @@ ON_ABORT_COMMAND=O <on_abort> call
 #    #<selected_pocket>
 REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change epilog=change_epilog
 
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
 # accessible in interp as #<_[section]name>
 # start of tool length touchoff probe
 [EMCMOT]
diff --git a/configs/sim/gmoccapy/gmoccapy_with_user_tabs.ini b/configs/sim/gmoccapy/gmoccapy_with_user_tabs.ini
index b97902ed56b..93e9838955a 100644
--- a/configs/sim/gmoccapy/gmoccapy_with_user_tabs.ini
+++ b/configs/sim/gmoccapy/gmoccapy_with_user_tabs.ini
@@ -68,7 +68,15 @@ py = python3
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ./macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ./python
+TOPLEVEL = ./python/toplevel.py
+LOG_LEVEL = 0
 
 # Motion control section ------------------------------------------------------
 [EMCMOT]
diff --git a/configs/sim/gmoccapy/lathe_configs/lathe.ini b/configs/sim/gmoccapy/lathe_configs/lathe.ini
index 979852e5ae2..a5d34e3d5c4 100644
--- a/configs/sim/gmoccapy/lathe_configs/lathe.ini
+++ b/configs/sim/gmoccapy/lathe_configs/lathe.ini
@@ -45,7 +45,15 @@ py = python3
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G18 G21 G40 G49 G54 G80 G90 G94 G8 M9 M5 G64 P0.005
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ../macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task------------------------------
+[PYTHON]
+PATH_PREPEND = ../python
+TOPLEVEL = ../python/toplevel.py
+LOG_LEVEL = 0
 
 # Motion control section ------------------------------------------------------
 [EMCMOT]
diff --git a/configs/sim/gmoccapy/lathe_configs/lathe_C.ini b/configs/sim/gmoccapy/lathe_configs/lathe_C.ini
index f3d27e2d8eb..cdbc912fc2e 100644
--- a/configs/sim/gmoccapy/lathe_configs/lathe_C.ini
+++ b/configs/sim/gmoccapy/lathe_configs/lathe_C.ini
@@ -46,7 +46,15 @@ py = python3
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G18 G21 G40 G49 G54 G80 G90 G94 G8 M9 M5 G64 P0.005
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ../macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ../python
+TOPLEVEL = ../python/toplevel.py
+LOG_LEVEL = 0
 
 # Motion control section ------------------------------------------------------
 [EMCMOT]
diff --git a/configs/sim/gmoccapy/lathe_configs/lathe_CW.ini b/configs/sim/gmoccapy/lathe_configs/lathe_CW.ini
index 8c950dc8c2b..2c61ab5f80d 100644
--- a/configs/sim/gmoccapy/lathe_configs/lathe_CW.ini
+++ b/configs/sim/gmoccapy/lathe_configs/lathe_CW.ini
@@ -46,7 +46,15 @@ py = python3
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G18 G21 G40 G49 G54 G80 G90 G94 G8 M9 M5 G64 P0.005
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ../macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task-------------------------------
+[PYTHON]
+PATH_PREPEND = ../python
+TOPLEVEL = ../python/toplevel.py
+LOG_LEVEL = 0
 
 # Motion control section ------------------------------------------------------
 [EMCMOT]
diff --git a/configs/sim/gmoccapy/lathe_configs/lathe_backtool.ini b/configs/sim/gmoccapy/lathe_configs/lathe_backtool.ini
index 6897ee2c509..9626396c707 100644
--- a/configs/sim/gmoccapy/lathe_configs/lathe_backtool.ini
+++ b/configs/sim/gmoccapy/lathe_configs/lathe_backtool.ini
@@ -46,7 +46,15 @@ py = python3
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G18 G21 G40 G49 G54 G80 G90 G94 G8 M9 M5 G64 P0.005
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ../macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task-------------------------------
+[PYTHON]
+PATH_PREPEND = ../python
+TOPLEVEL = ../python/toplevel.py
+LOG_LEVEL = 0
 
 # Motion control section ------------------------------------------------------
 [EMCMOT]
diff --git a/configs/sim/gmoccapy/lathe_configs/lathe_imperial.ini b/configs/sim/gmoccapy/lathe_configs/lathe_imperial.ini
index f38d8b815c1..8f54db3877f 100644
--- a/configs/sim/gmoccapy/lathe_configs/lathe_imperial.ini
+++ b/configs/sim/gmoccapy/lathe_configs/lathe_imperial.ini
@@ -46,7 +46,15 @@ py = python3
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G18 G20 G40 G49 G54 G80 G90 G94 G8 M9 M5 G64 P0.001
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros
+SUBROUTINE_PATH = ../macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task-------------------------------
+[PYTHON]
+PATH_PREPEND = ../python
+TOPLEVEL = ../python/toplevel.py
+LOG_LEVEL = 0
 
 # Motion control section ------------------------------------------------------
 [EMCMOT]
diff --git a/configs/sim/gmoccapy/lathe_configs/lathe_macros.ini b/configs/sim/gmoccapy/lathe_configs/lathe_macros.ini
index b9dfe5a429d..3454c713eac 100644
--- a/configs/sim/gmoccapy/lathe_configs/lathe_macros.ini
+++ b/configs/sim/gmoccapy/lathe_configs/lathe_macros.ini
@@ -51,7 +51,15 @@ py = python3
 [RS274NGC]
 RS274NGC_STARTUP_CODE = G18 G21 G40 G49 G54 G80 G90 G94 G8 M9 M5 G64 P0.005
 PARAMETER_FILE = sim.var
-SUBROUTINE_PATH = macros:./
+SUBROUTINE_PATH = ../macros:./
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task-------------------------------
+[PYTHON]
+PATH_PREPEND = ../python
+TOPLEVEL = ../python/toplevel.py
+LOG_LEVEL = 0
 
 # Motion control section ------------------------------------------------------
 [EMCMOT]
@@ -72,7 +80,7 @@ HALFILE = spindle_sim.hal
 HALFILE = simulated_home_lathe.hal
 
 # Single file that is executed after the GUI has started.
-#POSTGUI_HALFILE = gmoccapy_postgui.hal
+POSTGUI_HALFILE = ./gmoccapy_postgui.hal
 
 HALUI = halui
 
@@ -156,10 +164,5 @@ HOME_IS_SHARED = 1
 
 # section for main IO controller parameters -----------------------------------
 [MACROS]
-MACRO = i_am_lost
-MACRO = halo_world
-MACRO = jog_around
-MACRO = increment xinc yinc
-MACRO = go_to_position X-pos Y-pos Z-pos
 
 
diff --git a/configs/sim/gmoccapy/macros/change_g43.ngc b/configs/sim/gmoccapy/macros/change_g43.ngc
new file mode 100644
index 00000000000..480abb2e57d
--- /dev/null
+++ b/configs/sim/gmoccapy/macros/change_g43.ngc
@@ -0,0 +1,21 @@
+o<change_g43> sub
+;(debug, in change tool_in_spindle=#<tool_in_spindle> current_pocket=#<current_pocket>)
+;(debug, selected_tool=#<selected_tool> selected_pocket=#<selected_pocket>)
+
+; we must execute this only in the milltask interpreter
+; or preview will break, so test for '#<_task>' which is 1 for 
+; the milltask interpreter and 0 in the UI's
+O100 if [#<_task> EQ 0]
+        (debug, Task ist Null)
+O100     return [999]
+O100 endif
+
+; using the code being remapped here means 'use builtin behaviour'
+M6
+
+; set tool offset
+G43
+
+; signal success be returning a value > 0:
+o<change_g43> endsub [1]
+M2
\ No newline at end of file
diff --git a/configs/sim/gmoccapy/macros/settool_g43.ngc b/configs/sim/gmoccapy/macros/settool_g43.ngc
new file mode 100644
index 00000000000..2b81f31f949
--- /dev/null
+++ b/configs/sim/gmoccapy/macros/settool_g43.ngc
@@ -0,0 +1,20 @@
+o<settool_g43> sub
+;(debug, tool=#<tool> pocket=#<pocket>)
+
+; we must execute this only in the milltask interpreter
+; or preview will break, so test for '#<_task>' which is 1 for 
+; the milltask interpreter and 0 in the UI's
+O100 if [#<_task> EQ 0]
+        (debug, Task ist Null)
+O100     return [999]
+O100 endif
+
+; using the code being remapped here means 'use builtin behaviour'
+m61 q#<tool>
+
+; set tool offset
+G43
+
+; signal success be returning a value > 0:
+o<settool_g43> endsub [1]
+M2
\ No newline at end of file
diff --git a/configs/sim/gmoccapy/non_trivial_kinematics/Gantry/gantry_mm.ini b/configs/sim/gmoccapy/non_trivial_kinematics/Gantry/gantry_mm.ini
index 5b4d0f3c817..741dfcdbe42 100644
--- a/configs/sim/gmoccapy/non_trivial_kinematics/Gantry/gantry_mm.ini
+++ b/configs/sim/gmoccapy/non_trivial_kinematics/Gantry/gantry_mm.ini
@@ -38,6 +38,14 @@ CYCLE_TIME = 0.001
 RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9
 PARAMETER_FILE = sim.var
 SUBROUTINE_PATH = ../../macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ../../python
+TOPLEVEL = ../../python/toplevel.py
+LOG_LEVEL = 0
 
 [EMCMOT]
 EMCMOT = motmod
diff --git a/configs/sim/gmoccapy/non_trivial_kinematics/table-rotary-tilting/xyzac-trt.ini b/configs/sim/gmoccapy/non_trivial_kinematics/table-rotary-tilting/xyzac-trt.ini
index 9362b1ba400..fc9fe18df16 100644
--- a/configs/sim/gmoccapy/non_trivial_kinematics/table-rotary-tilting/xyzac-trt.ini
+++ b/configs/sim/gmoccapy/non_trivial_kinematics/table-rotary-tilting/xyzac-trt.ini
@@ -19,8 +19,16 @@ NGCGUI_FONT = Helvetica -12 normal
 NGCGUI_SUBFILE = test-xyzac.ngc
 
 [RS274NGC]
-SUBROUTINE_PATH = ./examples
 PARAMETER_FILE = xyzac.var
+SUBROUTINE_PATH = ./examples:../../macros
+REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change_g43 epilog=change_epilog
+REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool_g43 epilog=settool_epilog
+
+# the Python plugins serves interpreter and task
+[PYTHON]
+PATH_PREPEND = ../../python
+TOPLEVEL = ../../python/toplevel.py
+LOG_LEVEL = 0
 
 [HAL]
 HALUI = halui
diff --git a/configs/sim/gmoccapy/python/stdglue.py b/configs/sim/gmoccapy/python/stdglue.py
index 3fc8f039b3e..2d5be364e4e 100644
--- a/configs/sim/gmoccapy/python/stdglue.py
+++ b/configs/sim/gmoccapy/python/stdglue.py
@@ -47,6 +47,58 @@
             emccanon.MESSAGE( "no pydevd module found" )
             pass
 
+
+# REMAP=M61  modalgroup=6 prolog=settool_prolog ngc=settool epilog=settool_epilog
+# exposed parameters: #<tool> #<pocket>
+
+def settool_prolog(self,**words):
+    try:
+        c = self.blocks[self.remap_level]
+        if not c.q_flag:
+            self.set_errormsg("M61 requires a Q parameter") 
+            return INTERP_ERROR
+        tool = int(c.q_number)
+        if tool < -TOLERANCE_EQUAL: # 'less than 0 within interp's precision'
+            self.set_errormsg("M61: Q value < 0") 
+            return INTERP_ERROR
+        (status,pocket) = self.find_tool_pocket(tool)
+        if status != INTERP_OK:
+            self.set_errormsg("M61 failed: requested tool %d not in table" % (tool))
+            return status
+        self.params["tool"] = tool
+        self.params["pocket"] = pocket
+        return INTERP_OK
+    except Exception as e:
+        self.set_errormsg("M61/settool_prolog: %s)" % (e))
+        return INTERP_ERROR
+
+def settool_epilog(self,**words):
+    try:
+        if not self.value_returned:
+            r = self.blocks[self.remap_level].executing_remap
+            self.set_errormsg("the %s remap procedure %s did not return a value"
+                             % (r.name,r.remap_ngc if r.remap_ngc else r.remap_py))
+            return INTERP_ERROR
+
+        if self.blocks[self.remap_level].builtin_used:
+            #print "---------- M61 builtin recursion, nothing to do"
+            return INTERP_OK
+        else:
+            if self.return_value > 0.0:
+                self.current_tool = int(self.params["tool"])
+                self.current_pocket = int(self.params["pocket"])
+                emccanon.CHANGE_TOOL_NUMBER(self.current_pocket)
+                # cause a sync()
+                self.tool_change_flag = True
+                self.set_tool_parameters()
+            else:
+                self.set_errormsg("M61 aborted (return code %.1f)" % (self.return_value))
+                return INTERP_ERROR
+    except Exception as e:
+        self.set_errormsg("M61/settool_epilog: %s)" % (e))
+        return INTERP_ERROR
+
+
 # REMAP=M6  modalgroup=6 prolog=change_prolog ngc=change epilog=change_epilog
 # exposed parameters:
 #    #<tool_in_spindle>
diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.py b/src/emc/usr_intf/gmoccapy/gmoccapy.py
index fe48973ecbf..d66877e81e3 100644
--- a/src/emc/usr_intf/gmoccapy/gmoccapy.py
+++ b/src/emc/usr_intf/gmoccapy/gmoccapy.py
@@ -3542,12 +3542,6 @@ def _update_toolinfo(self, tool):
             self.on_hal_status_interp_idle(None)
             return
 
-        if "G43" in self.active_gcodes and self.stat.task_mode != linuxcnc.MODE_AUTO:
-            self.command.mode(linuxcnc.MODE_MDI)
-            self.command.wait_complete()
-            self.command.mdi("G43")
-            self.command.wait_complete()
-
     def _set_enable_tooltips(self, value):
         LOG.debug("_set_enable_tooltips = {0}".format(value))
         # this will hide the tooltips from the glade file widgets,
diff --git a/src/emc/usr_intf/gmoccapy/release_notes.txt b/src/emc/usr_intf/gmoccapy/release_notes.txt
index 4ac7feec822..4ed29ee338b 100644
--- a/src/emc/usr_intf/gmoccapy/release_notes.txt
+++ b/src/emc/usr_intf/gmoccapy/release_notes.txt
@@ -1,3 +1,9 @@
+ver 3.5.0
+ - version for 2.10 (master) branche
+ - removed internal AUTOMATIC_G43 function, it is recommended to add
+   the M6/M61 remap with the G43 command to the INI configuration.
+   Internal AUTOMATIC_G43 caused bugs in some configurations and situations.
+
 ver 3.4.8
  - re-ordered settings pages to have all appearance-related on one page
  - add configuration for 800x600 screens