diff --git a/lib/Slic3r/GUI/OptionsGroup.pm b/lib/Slic3r/GUI/OptionsGroup.pm
index a537d6215..962e6ffc0 100644
--- a/lib/Slic3r/GUI/OptionsGroup.pm
+++ b/lib/Slic3r/GUI/OptionsGroup.pm
@@ -216,6 +216,7 @@ sub _build_field {
     return undef if !$field;
     
     #! setting up a function that will be triggered when the field changes
+    #! think of it as $field->on_change = ($on_change)
     $field->on_change($on_change);
     $field->on_kill_focus($on_kill_focus);
     $self->_fields->{$opt_id} = $field;
diff --git a/xs/src/slic3r/GUI/GUI.cpp b/xs/src/slic3r/GUI/GUI.cpp
index 24b11e2a8..57b209d15 100644
--- a/xs/src/slic3r/GUI/GUI.cpp
+++ b/xs/src/slic3r/GUI/GUI.cpp
@@ -4,6 +4,7 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/lexical_cast.hpp>
 
 #if __APPLE__
 #import <IOKit/pwr_mgt/IOPMLib.h>
@@ -191,6 +192,58 @@ void create_preset_tabs(PresetBundle *preset_bundle, AppConfig *app_config)
 	add_created_tab(new TabPrinter (g_wxTabPanel, "Printer"),  preset_bundle, app_config);
 }
 
+void change_opt_value(DynamicPrintConfig& config, t_config_option_key opt_key, boost::any value)
+{
+	try{
+		switch (config.def()->get(opt_key)->type){
+		case coFloatOrPercent:
+		case coPercent:
+		case coFloat:
+		{
+			double& val = config.opt_float(opt_key);
+			std::string str = boost::any_cast<std::string>(value);
+			val = boost::lexical_cast<double>(str);
+			break;
+		}
+			//		case coPercents:
+			//		case coFloats:
+		case coString:
+			//		opt = new ConfigOptionString(config.opt_string(opt_key));
+			break;
+		case coStrings:
+			break;
+		case coBool:
+			config.set_key_value(opt_key, new ConfigOptionBool(boost::any_cast<bool>(value)));
+			break;
+		case coBools:
+			//			opt = new ConfigOptionBools(0, config.opt_bool(opt_key)); //! 0?
+			break;
+		case coInt:
+			config.set_key_value(opt_key, new ConfigOptionInt(boost::any_cast<int>(value)));
+			break;
+		case coInts:
+			break;
+		case coEnum:
+			break;
+		case coPoints:
+			break;
+		case coNone:
+			break;
+		default:
+			break;
+		}
+	}
+	catch (const std::exception &e)
+	{
+
+	}
+	catch (...)
+	{
+		//std::string
+	}
+
+}
+
 void add_created_tab(Tab* panel, PresetBundle *preset_bundle, AppConfig *app_config)
 {
 	panel->m_no_controller = app_config->get("no_controller").empty();
diff --git a/xs/src/slic3r/GUI/GUI.hpp b/xs/src/slic3r/GUI/GUI.hpp
index 4f9e45aef..f1b15f135 100644
--- a/xs/src/slic3r/GUI/GUI.hpp
+++ b/xs/src/slic3r/GUI/GUI.hpp
@@ -3,6 +3,7 @@
 
 #include <string>
 #include <vector>
+#include "Config.hpp"
 
 class wxApp;
 class wxFrame;
@@ -15,6 +16,7 @@ namespace Slic3r {
 class PresetBundle;
 class PresetCollection;
 class AppConfig;
+class DynamicPrintConfig;
 
 namespace GUI {
 
@@ -36,6 +38,8 @@ void add_debug_menu(wxMenuBar *menu);
 void create_preset_tabs(PresetBundle *preset_bundle, AppConfig *app_config);
 // add it at the end of the tab panel.
 void add_created_tab(Tab* panel, PresetBundle *preset_bundle, AppConfig *app_config);
+// Change option value in config
+void change_opt_value(DynamicPrintConfig& config, t_config_option_key opt_key, boost::any value);
 
 void show_error(wxWindow* parent, std::string message);
 void show_info(wxWindow* parent, std::string message, std::string title);
diff --git a/xs/src/slic3r/GUI/OptionsGroup.cpp b/xs/src/slic3r/GUI/OptionsGroup.cpp
index 438dc284c..784e9b654 100644
--- a/xs/src/slic3r/GUI/OptionsGroup.cpp
+++ b/xs/src/slic3r/GUI/OptionsGroup.cpp
@@ -10,7 +10,7 @@ const t_field& OptionsGroup::build_field(const Option& opt) {
     return build_field(opt.opt_id, opt.opt);
 }
 const t_field& OptionsGroup::build_field(const t_config_option_key& id) {
-	const ConfigOptionDef& opt = m_options_map.at(id);
+	const ConfigOptionDef& opt = m_options.at(id);
     return build_field(id, opt);
 }
 
@@ -196,33 +196,49 @@ void OptionsGroup::_on_kill_focus (t_config_option_key id) {
     // do nothing.
 }
 
+Option ConfigOptionsGroup::get_option(const std::string opt_key, int opt_index /*= -1*/)
+{
+	if (!m_config->has(opt_key)) {
+		//! exception  ("No $opt_key in ConfigOptionsGroup config");
+	}
+
+	std::string opt_id = opt_index == -1 ? opt_key : opt_key + "#" + std::to_string(opt_index);
+	std::pair<std::string, int> pair(opt_key, opt_index);
+	m_opt_map.emplace(opt_id, pair);
+
+	return Option(*m_config->def()->get(opt_key), opt_id);
+}
+
 void ConfigOptionsGroup::on_change_OG(t_config_option_key opt_id, boost::any value)
 {
-// 	if (m_options_map.at(opt_id)/*exists $self->_opt_map->{$opt_id}*/) {
-// 		my($opt_key, $opt_index) = @{ $self->_opt_map->{$opt_id} };
-// 		auto option = m_options->{$opt_id};
+	if (!m_opt_map.empty())
+	{
+		std::string opt_key = m_opt_map.at(opt_id).first;
+		int opt_index = m_opt_map.at(opt_id).second;
+		auto option = m_options.at(opt_id);
 
 		// get value
 		auto field_value = get_value(opt_id);
-// 		if ($option->gui_flags = ~/ \bserialized\b / ) {
-// 			die "Can't set serialized option indexed value" if $opt_index != -1;
-// 			# Split a string to multiple strings by a semi - colon.This is the old way of storing multi - string values.
-// 			# Currently used for the post_process config value only.
-// 			my @values = split / ; / , $field_value;
-// 			$self->config->set($opt_key, \@values);
-// 		}
-// 		else {
-// 			if ($opt_index == -1) {
-//				$self->config->set($opt_key, $field_value);
-//!		m_config->set_key_value(opt_id, new ConfigOption(value));
-// 			}
-// 			else {
-// 				my $value = $self->config->get($opt_key);
+		if (option.gui_flags.compare("serialized")==0) {
+			if (opt_index != -1){
+				// 		die "Can't set serialized option indexed value" ;
+			}
+			// 		# Split a string to multiple strings by a semi - colon.This is the old way of storing multi - string values.
+			// 		# Currently used for the post_process config value only.
+			// 		my @values = split / ; / , $field_value;
+			// 		$self->config->set($opt_key, \@values);
+		}
+		else {
+			if (opt_index == -1) {
+				change_opt_value(*m_config, opt_key, field_value);
+			}
+			else {
+// 				auto value = m_config->get($opt_key);
 // 				$value->[$opt_index] = $field_value;
 // 				$self->config->set($opt_key, $value);
-// 			}
-// 		}
-// 	}
+			}
+		}
+	}
 
 	OptionsGroup::on_change_OG(opt_id, value);
 }
diff --git a/xs/src/slic3r/GUI/OptionsGroup.hpp b/xs/src/slic3r/GUI/OptionsGroup.hpp
index 00bb55c61..bd8140276 100644
--- a/xs/src/slic3r/GUI/OptionsGroup.hpp
+++ b/xs/src/slic3r/GUI/OptionsGroup.hpp
@@ -88,9 +88,9 @@ public:
     /// but defining it as const means a lot of const_casts to deal with wx functions.
     inline wxWindow* parent() const { return m_parent; }
 
-    void			append_line(const Line& line);
-    Line			create_single_option_line(const Option& option) const;
-    inline void		append_single_option_line(const Option& option) { append_line(create_single_option_line(option)); }
+    void		append_line(const Line& line);
+    Line		create_single_option_line(const Option& option) const;
+    void		append_single_option_line(const Option& option) { append_line(create_single_option_line(option)); }
 
     // return a non-owning pointer reference 
     inline /*const*/ Field* get_field(t_config_option_key id) const { try { return m_fields.at(id).get(); } catch (std::out_of_range e) { return nullptr; } }
@@ -103,7 +103,7 @@ public:
     inline void		disable() { for (auto& field : m_fields) field.second->disable(); }
 
     OptionsGroup(wxWindow* _parent, std::string title, const ConfigDef& configs) : 
-		m_options_map(configs.options), m_parent(_parent), title(wxString(title)) {
+		m_options(configs.options), m_parent(_parent), title(wxString(title)) {
         sizer = (staticbox ? new wxStaticBoxSizer(new wxStaticBox(_parent, wxID_ANY, title), wxVERTICAL) : new wxBoxSizer(wxVERTICAL));
         auto num_columns = 1U;
         if (label_width != 0) num_columns++;
@@ -116,7 +116,7 @@ public:
     }
 
 protected:
-    const t_optiondef_map&	m_options_map; 
+    const t_optiondef_map&	m_options;
     wxWindow*				m_parent {nullptr};
 
     /// Field list, contains unique_ptrs of the derived type.
@@ -139,11 +139,27 @@ protected:
 
 class ConfigOptionsGroup: public OptionsGroup {
 public:
-    /// reference to libslic3r config, non-owning pointer (?).
-    const DynamicPrintConfig*	m_config {nullptr};
-    bool						m_full_labels {0};
 	ConfigOptionsGroup(wxWindow* parent, std::string title, DynamicPrintConfig* _config) : 
-		OptionsGroup(parent, title, *(_config->def())), m_config(_config) {}
+		OptionsGroup(parent, title, *_config->def()), m_config(_config) {}
+
+    /// reference to libslic3r config, non-owning pointer (?).
+    DynamicPrintConfig*		m_config {nullptr};
+    bool					m_full_labels {0};
+	std::map< std::string, std::pair<std::string, int> > m_opt_map;
+
+	Option		get_option(const std::string opt_key, int opt_index = -1);
+	Line		create_single_option_line(const std::string title, int idx = -1) /*const*/{
+		Option option = get_option(title, idx);
+		return OptionsGroup::create_single_option_line(option);
+	}
+	void		append_single_option_line(const Option& option)	{
+		OptionsGroup::append_single_option_line(option);
+	}
+	void		append_single_option_line(const std::string title, int idx = -1)
+	{
+		Option option = get_option(title, idx);
+		append_single_option_line(option);		
+	}
 
 	void		on_change_OG(t_config_option_key opt_id, boost::any value) override;
 };
diff --git a/xs/src/slic3r/GUI/Tab.cpp b/xs/src/slic3r/GUI/Tab.cpp
index 61aaa0830..ea69bafbf 100644
--- a/xs/src/slic3r/GUI/Tab.cpp
+++ b/xs/src/slic3r/GUI/Tab.cpp
@@ -148,28 +148,27 @@ void Tab::load_config(DynamicPrintConfig config)
 {
 	bool modified = 0;
 	for(auto opt_key : m_config.diff(config)) {
-		ConfigOption* opt;
 		switch ( config.def()->get(opt_key)->type ){
-//		case coFloatOrPercent:
+		case coFloatOrPercent:
 		case coPercent:
-//		case coPercents:			
 		case coFloat:
-			opt = new ConfigOptionFloat(config.opt_float(opt_key));
+			change_opt_value(m_config, opt_key, config.opt_float(opt_key));
 			break;
+//		case coPercents:
 //		case coFloats:
 		case coString:
-			opt = new ConfigOptionString(config.opt_string(opt_key));
+			change_opt_value(m_config, opt_key, config.opt_string(opt_key));
 			break;
 		case coStrings:
 			break;
 		case coBool:
-			opt = new ConfigOptionBool(config.opt_bool(opt_key));
+			change_opt_value(m_config, opt_key, config.opt_bool(opt_key));
 			break;
 		case coBools:
 //			opt = new ConfigOptionBools(0, config.opt_bool(opt_key)); //! 0?
 			break;
 		case coInt:
-			opt = new ConfigOptionInt(config.opt_int(opt_key));
+			change_opt_value(m_config, opt_key, config.opt_int(opt_key));
 			break;
 		case coInts:
 			break;
@@ -177,15 +176,15 @@ void Tab::load_config(DynamicPrintConfig config)
 			break;
 		case coPoints:
 			break;
-		case coNone:   break;
+		case coNone:
+			break;
 		default:
 			break;
 		}
-		m_config.set_key_value(opt_key, opt);
 		modified = 1;
 	}
 	if (modified) {
-//		update_dirty();
+		update_dirty();
 		//# Initialize UI components with the config values.
 //		_reload_config();
 		update();
@@ -216,187 +215,187 @@ void TabPrint::build()
 
 	auto page = add_options_page("Layers and perimeters", "layers.png");
 		auto optgroup = page->new_optgroup("Layer height");
-		optgroup->append_single_option_line(get_option("layer_height"));
-		optgroup->append_single_option_line(get_option("first_layer_height"));
+		optgroup->append_single_option_line("layer_height");
+		optgroup->append_single_option_line("first_layer_height");
 
 		optgroup = page->new_optgroup("Vertical shells");
-		optgroup->append_single_option_line(get_option("perimeters"));
-		optgroup->append_single_option_line(get_option("spiral_vase"));
+		optgroup->append_single_option_line("perimeters");
+		optgroup->append_single_option_line("spiral_vase");
 
 		optgroup = page->new_optgroup("Horizontal shells");
 		Line line{ "Solid layers", "" };
-		line.append_option(get_option("top_solid_layers"));
-		line.append_option(get_option("bottom_solid_layers"));
+		line.append_option(optgroup->get_option("top_solid_layers"));
+		line.append_option(optgroup->get_option("bottom_solid_layers"));
 		optgroup->append_line(line);
 
 		optgroup = page->new_optgroup("Quality (slower slicing)");
-		optgroup->append_single_option_line(get_option("extra_perimeters"));
-		optgroup->append_single_option_line(get_option("ensure_vertical_shell_thickness"));
-		optgroup->append_single_option_line(get_option("avoid_crossing_perimeters"));
-		optgroup->append_single_option_line(get_option("thin_walls"));
-		optgroup->append_single_option_line(get_option("overhangs"));
+		optgroup->append_single_option_line("extra_perimeters");
+		optgroup->append_single_option_line("ensure_vertical_shell_thickness");
+		optgroup->append_single_option_line("avoid_crossing_perimeters");
+		optgroup->append_single_option_line("thin_walls");
+		optgroup->append_single_option_line("overhangs");
 
 		optgroup = page->new_optgroup("Advanced");
-		optgroup->append_single_option_line(get_option("seam_position"));
-		optgroup->append_single_option_line(get_option("external_perimeters_first"));
+		optgroup->append_single_option_line("seam_position");
+		optgroup->append_single_option_line("external_perimeters_first");
 
 	page = add_options_page("Infill", "infill.png");
 		optgroup = page->new_optgroup("Infill");
-		optgroup->append_single_option_line(get_option("fill_density"));
-		optgroup->append_single_option_line(get_option("fill_pattern"));
-		optgroup->append_single_option_line(get_option("external_fill_pattern"));
+		optgroup->append_single_option_line("fill_density");
+		optgroup->append_single_option_line("fill_pattern");
+		optgroup->append_single_option_line("external_fill_pattern");
 
 		optgroup = page->new_optgroup("Reducing printing time");
-		optgroup->append_single_option_line(get_option("infill_every_layers"));
-		optgroup->append_single_option_line(get_option("infill_only_where_needed"));
+		optgroup->append_single_option_line("infill_every_layers");
+		optgroup->append_single_option_line("infill_only_where_needed");
 
 		optgroup = page->new_optgroup("Advanced");
-		optgroup->append_single_option_line(get_option("solid_infill_every_layers"));
-		optgroup->append_single_option_line(get_option("fill_angle"));
-		optgroup->append_single_option_line(get_option("solid_infill_below_area"));
-		optgroup->append_single_option_line(get_option("bridge_angle"));
-		optgroup->append_single_option_line(get_option("only_retract_when_crossing_perimeters"));
-		optgroup->append_single_option_line(get_option("infill_first"));
+		optgroup->append_single_option_line("solid_infill_every_layers");
+		optgroup->append_single_option_line("fill_angle");
+		optgroup->append_single_option_line("solid_infill_below_area");
+		optgroup->append_single_option_line("bridge_angle");
+		optgroup->append_single_option_line("only_retract_when_crossing_perimeters");
+		optgroup->append_single_option_line("infill_first");
 
 	page = add_options_page("Skirt and brim", "box.png");
 		optgroup = page->new_optgroup("Skirt");
-		optgroup->append_single_option_line(get_option("skirts"));
-		optgroup->append_single_option_line(get_option("skirt_distance"));
-		optgroup->append_single_option_line(get_option("skirt_height"));
-		optgroup->append_single_option_line(get_option("min_skirt_length"));
+		optgroup->append_single_option_line("skirts");
+		optgroup->append_single_option_line("skirt_distance");
+		optgroup->append_single_option_line("skirt_height");
+		optgroup->append_single_option_line("min_skirt_length");
 
 		optgroup = page->new_optgroup("Brim");
-		optgroup->append_single_option_line(get_option("brim_width"));
+		optgroup->append_single_option_line("brim_width");
 
 	page = add_options_page("Support material", "building.png");
 		optgroup = page->new_optgroup("Support material");
-		optgroup->append_single_option_line(get_option("support_material"));
-		optgroup->append_single_option_line(get_option("support_material_threshold"));
-		optgroup->append_single_option_line(get_option("support_material_enforce_layers"));
+		optgroup->append_single_option_line("support_material");
+		optgroup->append_single_option_line("support_material_threshold");
+		optgroup->append_single_option_line("support_material_enforce_layers");
 
 		optgroup = page->new_optgroup("Raft");
-		optgroup->append_single_option_line(get_option("raft_layers"));
-//		# optgroup->append_single_option_line(get_option_("raft_contact_distance"));
+		optgroup->append_single_option_line("raft_layers");
+//		# optgroup->append_single_option_line(get_option_("raft_contact_distance");
 
 		optgroup = page->new_optgroup("Options for support material and raft");
-		optgroup->append_single_option_line(get_option("support_material_contact_distance"));
-		optgroup->append_single_option_line(get_option("support_material_pattern"));
-		optgroup->append_single_option_line(get_option("support_material_with_sheath"));
-		optgroup->append_single_option_line(get_option("support_material_spacing"));
-		optgroup->append_single_option_line(get_option("support_material_angle"));
-		optgroup->append_single_option_line(get_option("support_material_interface_layers"));
-		optgroup->append_single_option_line(get_option("support_material_interface_spacing"));
-		optgroup->append_single_option_line(get_option("support_material_interface_contact_loops"));
-		optgroup->append_single_option_line(get_option("support_material_buildplate_only"));
-		optgroup->append_single_option_line(get_option("support_material_xy_spacing"));
-		optgroup->append_single_option_line(get_option("dont_support_bridges"));
-		optgroup->append_single_option_line(get_option("support_material_synchronize_layers"));
+		optgroup->append_single_option_line("support_material_contact_distance");
+		optgroup->append_single_option_line("support_material_pattern");
+		optgroup->append_single_option_line("support_material_with_sheath");
+		optgroup->append_single_option_line("support_material_spacing");
+		optgroup->append_single_option_line("support_material_angle");
+		optgroup->append_single_option_line("support_material_interface_layers");
+		optgroup->append_single_option_line("support_material_interface_spacing");
+		optgroup->append_single_option_line("support_material_interface_contact_loops");
+		optgroup->append_single_option_line("support_material_buildplate_only");
+		optgroup->append_single_option_line("support_material_xy_spacing");
+		optgroup->append_single_option_line("dont_support_bridges");
+		optgroup->append_single_option_line("support_material_synchronize_layers");
 
 	page = add_options_page("Speed", "time.png");
 		optgroup = page->new_optgroup("Speed for print moves");
-		optgroup->append_single_option_line(get_option("perimeter_speed"));
-		optgroup->append_single_option_line(get_option("small_perimeter_speed"));
-		optgroup->append_single_option_line(get_option("external_perimeter_speed"));
-		optgroup->append_single_option_line(get_option("infill_speed"));
-		optgroup->append_single_option_line(get_option("solid_infill_speed"));
-		optgroup->append_single_option_line(get_option("top_solid_infill_speed"));
-		optgroup->append_single_option_line(get_option("support_material_speed"));
-		optgroup->append_single_option_line(get_option("support_material_interface_speed"));
-		optgroup->append_single_option_line(get_option("bridge_speed"));
-		optgroup->append_single_option_line(get_option("gap_fill_speed"));
+		optgroup->append_single_option_line("perimeter_speed");
+		optgroup->append_single_option_line("small_perimeter_speed");
+		optgroup->append_single_option_line("external_perimeter_speed");
+		optgroup->append_single_option_line("infill_speed");
+		optgroup->append_single_option_line("solid_infill_speed");
+		optgroup->append_single_option_line("top_solid_infill_speed");
+		optgroup->append_single_option_line("support_material_speed");
+		optgroup->append_single_option_line("support_material_interface_speed");
+		optgroup->append_single_option_line("bridge_speed");
+		optgroup->append_single_option_line("gap_fill_speed");
 
 		optgroup = page->new_optgroup("Speed for non-print moves");
-		optgroup->append_single_option_line(get_option("travel_speed"));
+		optgroup->append_single_option_line("travel_speed");
 
 		optgroup = page->new_optgroup("Modifiers");
-		optgroup->append_single_option_line(get_option("first_layer_speed"));
+		optgroup->append_single_option_line("first_layer_speed");
 
 		optgroup = page->new_optgroup("Acceleration control (advanced)");
-		optgroup->append_single_option_line(get_option("perimeter_acceleration"));
-		optgroup->append_single_option_line(get_option("infill_acceleration"));
-		optgroup->append_single_option_line(get_option("bridge_acceleration"));
-		optgroup->append_single_option_line(get_option("first_layer_acceleration"));
-		optgroup->append_single_option_line(get_option("default_acceleration"));
+		optgroup->append_single_option_line("perimeter_acceleration");
+		optgroup->append_single_option_line("infill_acceleration");
+		optgroup->append_single_option_line("bridge_acceleration");
+		optgroup->append_single_option_line("first_layer_acceleration");
+		optgroup->append_single_option_line("default_acceleration");
 
 		optgroup = page->new_optgroup("Autospeed (advanced)");
-		optgroup->append_single_option_line(get_option("max_print_speed"));
-		optgroup->append_single_option_line(get_option("max_volumetric_speed"));
-		optgroup->append_single_option_line(get_option("max_volumetric_extrusion_rate_slope_positive"));
-		optgroup->append_single_option_line(get_option("max_volumetric_extrusion_rate_slope_negative"));
+		optgroup->append_single_option_line("max_print_speed");
+		optgroup->append_single_option_line("max_volumetric_speed");
+		optgroup->append_single_option_line("max_volumetric_extrusion_rate_slope_positive");
+		optgroup->append_single_option_line("max_volumetric_extrusion_rate_slope_negative");
 
 	page = add_options_page("Multiple Extruders", "funnel.png");
 		optgroup = page->new_optgroup("Extruders");
-		optgroup->append_single_option_line(get_option("perimeter_extruder"));
-		optgroup->append_single_option_line(get_option("infill_extruder"));
-		optgroup->append_single_option_line(get_option("solid_infill_extruder"));
-		optgroup->append_single_option_line(get_option("support_material_extruder"));
-		optgroup->append_single_option_line(get_option("support_material_interface_extruder"));
+		optgroup->append_single_option_line("perimeter_extruder");
+		optgroup->append_single_option_line("infill_extruder");
+		optgroup->append_single_option_line("solid_infill_extruder");
+		optgroup->append_single_option_line("support_material_extruder");
+		optgroup->append_single_option_line("support_material_interface_extruder");
 
 		optgroup = page->new_optgroup("Ooze prevention");
-		optgroup->append_single_option_line(get_option("ooze_prevention"));
-		optgroup->append_single_option_line(get_option("standby_temperature_delta"));
+		optgroup->append_single_option_line("ooze_prevention");
+		optgroup->append_single_option_line("standby_temperature_delta");
 
 		optgroup = page->new_optgroup("Wipe tower");
-		optgroup->append_single_option_line(get_option("wipe_tower"));
-		optgroup->append_single_option_line(get_option("wipe_tower_x"));
-		optgroup->append_single_option_line(get_option("wipe_tower_y"));
-		optgroup->append_single_option_line(get_option("wipe_tower_width"));
-		optgroup->append_single_option_line(get_option("wipe_tower_per_color_wipe"));
+		optgroup->append_single_option_line("wipe_tower");
+		optgroup->append_single_option_line("wipe_tower_x");
+		optgroup->append_single_option_line("wipe_tower_y");
+		optgroup->append_single_option_line("wipe_tower_width");
+		optgroup->append_single_option_line("wipe_tower_per_color_wipe");
 
 		optgroup = page->new_optgroup("Advanced");
-		optgroup->append_single_option_line(get_option("interface_shells"));
+		optgroup->append_single_option_line("interface_shells");
 
 	page = add_options_page("Advanced", "wrench.png");
 		optgroup = page->new_optgroup("Extrusion width", 180);
-		optgroup->append_single_option_line(get_option("extrusion_width"));
-		optgroup->append_single_option_line(get_option("first_layer_extrusion_width"));
-		optgroup->append_single_option_line(get_option("perimeter_extrusion_width"));
-		optgroup->append_single_option_line(get_option("external_perimeter_extrusion_width"));
-		optgroup->append_single_option_line(get_option("infill_extrusion_width"));
-		optgroup->append_single_option_line(get_option("solid_infill_extrusion_width"));
-		optgroup->append_single_option_line(get_option("top_infill_extrusion_width"));
-		optgroup->append_single_option_line(get_option("support_material_extrusion_width"));
+		optgroup->append_single_option_line("extrusion_width");
+		optgroup->append_single_option_line("first_layer_extrusion_width");
+		optgroup->append_single_option_line("perimeter_extrusion_width");
+		optgroup->append_single_option_line("external_perimeter_extrusion_width");
+		optgroup->append_single_option_line("infill_extrusion_width");
+		optgroup->append_single_option_line("solid_infill_extrusion_width");
+		optgroup->append_single_option_line("top_infill_extrusion_width");
+		optgroup->append_single_option_line("support_material_extrusion_width");
 
 		optgroup = page->new_optgroup("Overlap");
-		optgroup->append_single_option_line(get_option("infill_overlap"));
+		optgroup->append_single_option_line("infill_overlap");
 
 		optgroup = page->new_optgroup("Flow");
-		optgroup->append_single_option_line(get_option("bridge_flow_ratio"));
+		optgroup->append_single_option_line("bridge_flow_ratio");
 
 		optgroup = page->new_optgroup("Other");
-		optgroup->append_single_option_line(get_option("clip_multipart_objects"));
-		optgroup->append_single_option_line(get_option("elefant_foot_compensation"));
-		optgroup->append_single_option_line(get_option("xy_size_compensation"));
-//		#            optgroup->append_single_option_line(get_option_("threads"));
-		optgroup->append_single_option_line(get_option("resolution"));
+		optgroup->append_single_option_line("clip_multipart_objects");
+		optgroup->append_single_option_line("elefant_foot_compensation");
+		optgroup->append_single_option_line("xy_size_compensation");
+//		#            optgroup->append_single_option_line("threads");
+		optgroup->append_single_option_line("resolution");
 
 	page = add_options_page("Output options", "page_white_go.png");
 		optgroup = page->new_optgroup("Sequential printing");
-		optgroup->append_single_option_line(get_option("complete_objects"));
+		optgroup->append_single_option_line("complete_objects");
 		line = Line{ "Extruder clearance (mm)", "" };
-		Option option = get_option("extruder_clearance_radius");
+		Option option = optgroup->get_option("extruder_clearance_radius");
 		option.opt.width = 60;
 		line.append_option(option);
-		option = get_option("extruder_clearance_height");
+		option = optgroup->get_option("extruder_clearance_height");
 		option.opt.width = 60;
 		line.append_option(option);
 		optgroup->append_line(line);
 
 		optgroup = page->new_optgroup("Output file");
-		optgroup->append_single_option_line(get_option("gcode_comments"));
-		option = get_option("output_filename_format");
+		optgroup->append_single_option_line("gcode_comments");
+		option = optgroup->get_option("output_filename_format");
 		option.opt.full_width = true;
 		optgroup->append_single_option_line(option);
 
 		optgroup = page->new_optgroup("Post-processing scripts", 0);	
-		option = get_option("post_process");
+		option = optgroup->get_option("post_process");
 		option.opt.full_width = true;
 		option.opt.height = 50;
 		optgroup->append_single_option_line(option);
 
 	page = add_options_page("Notes", "note.png");
 		optgroup = page->new_optgroup("Notes", 0);						
-		option = get_option("notes");
+		option = optgroup->get_option("notes");
 		option.opt.full_width = true;
 		option.opt.height = 250;
 		optgroup->append_single_option_line(option);
@@ -621,27 +620,27 @@ void TabFilament::build()
 
 	auto page = add_options_page("Filament", "spool.png");
 		auto optgroup = page->new_optgroup("Filament");
-		optgroup->append_single_option_line(get_option("filament_colour"));
-		optgroup->append_single_option_line(get_option("filament_diameter"));
-		optgroup->append_single_option_line(get_option("extrusion_multiplier"));
-		optgroup->append_single_option_line(get_option("filament_density"));
-		optgroup->append_single_option_line(get_option("filament_cost"));
+		optgroup->append_single_option_line("filament_colour");
+		optgroup->append_single_option_line("filament_diameter");
+		optgroup->append_single_option_line("extrusion_multiplier");
+		optgroup->append_single_option_line("filament_density");
+		optgroup->append_single_option_line("filament_cost");
 
 		optgroup = page->new_optgroup("Temperature (°C)");
 		Line line = { "Extruder", "" };
-		line.append_option(get_option("first_layer_temperature"));
-		line.append_option(get_option("temperature"));
+		line.append_option(optgroup->get_option("first_layer_temperature"));
+		line.append_option(optgroup->get_option("temperature"));
 		optgroup->append_line(line);
 
 		line = { "Bed", "" };
-		line.append_option(get_option("first_layer_bed_temperature"));
-		line.append_option(get_option("bed_temperature"));
+		line.append_option(optgroup->get_option("first_layer_bed_temperature"));
+		line.append_option(optgroup->get_option("bed_temperature"));
 		optgroup->append_line(line);
 
 	page = add_options_page("Cooling", "hourglass.png");
 		optgroup = page->new_optgroup("Enable");
-		optgroup->append_single_option_line(get_option("fan_always_on"));
-		optgroup->append_single_option_line(get_option("cooling"));
+		optgroup->append_single_option_line("fan_always_on");
+		optgroup->append_single_option_line("cooling");
 
 		line = { "", "" }; 
 		line.full_width = 1;
@@ -652,25 +651,25 @@ void TabFilament::build()
 
 		optgroup = page->new_optgroup("Fan settings");
 		line = {"Fan speed",""};
-		line.append_option(get_option("min_fan_speed"));
-		line.append_option(get_option("max_fan_speed"));
+		line.append_option(optgroup->get_option("min_fan_speed"));
+		line.append_option(optgroup->get_option("max_fan_speed"));
 		optgroup->append_line(line);
 
-		optgroup->append_single_option_line(get_option("bridge_fan_speed"));
-		optgroup->append_single_option_line(get_option("disable_fan_first_layers"));
+		optgroup->append_single_option_line("bridge_fan_speed");
+		optgroup->append_single_option_line("disable_fan_first_layers");
 
 		optgroup = page->new_optgroup("Cooling thresholds", 250);
-		optgroup->append_single_option_line(get_option("fan_below_layer_time"));
-		optgroup->append_single_option_line(get_option("slowdown_below_layer_time"));
-		optgroup->append_single_option_line(get_option("min_print_speed"));
+		optgroup->append_single_option_line("fan_below_layer_time");
+		optgroup->append_single_option_line("slowdown_below_layer_time");
+		optgroup->append_single_option_line("min_print_speed");
 
 	page = add_options_page("Advanced", "wrench.png");
 		optgroup = page->new_optgroup("Filament properties");
-		optgroup->append_single_option_line(get_option("filament_type"));
-		optgroup->append_single_option_line(get_option("filament_soluble"));
+		optgroup->append_single_option_line("filament_type");
+		optgroup->append_single_option_line("filament_soluble");
 
 		optgroup = page->new_optgroup("Print speed override");
-		optgroup->append_single_option_line(get_option("filament_max_volumetric_speed"));
+		optgroup->append_single_option_line("filament_max_volumetric_speed");
 
 		line = {"",""};
 		line.full_width = 1;
@@ -681,13 +680,13 @@ void TabFilament::build()
 
 	page = add_options_page("Custom G-code", "cog.png");
 		optgroup = page->new_optgroup("Start G-code", 0);
-		Option option = get_option("start_filament_gcode");
+		Option option = optgroup->get_option("start_filament_gcode");
 		option.opt.full_width = true;
 		option.opt.height = 150;
 		optgroup->append_single_option_line(option);
 
 		optgroup = page->new_optgroup("End G-code", 0);
-		option = get_option("end_filament_gcode");
+		option = optgroup->get_option("end_filament_gcode");
 		option.opt.full_width = true;
 		option.opt.height = 150;
 		optgroup->append_single_option_line(option);
@@ -695,7 +694,7 @@ void TabFilament::build()
 	page = add_options_page("Notes", "note.png");
 		optgroup = page->new_optgroup("Notes", 0);
 		optgroup->label_width = 0;
-		option = get_option("filament_notes");
+		option = optgroup->get_option("filament_notes");
 		option.opt.full_width = true;
 		option.opt.height = 250;
 		optgroup->append_single_option_line(option);
@@ -754,7 +753,7 @@ void TabPrinter::build()
 			return sizer;
 		};
 		optgroup->append_line(line);
-		optgroup->append_single_option_line(get_option("z_offset"));
+		optgroup->append_single_option_line("z_offset");
 
 		optgroup = page->new_optgroup("Capabilities");
 		ConfigOptionDef def;
@@ -765,7 +764,7 @@ void TabPrinter::build()
 			def.min = 1;
 		Option option(def, "extruders_count");
 		optgroup->append_single_option_line(option);
-		optgroup->append_single_option_line(get_option("single_extruder_multi_material"));
+		optgroup->append_single_option_line("single_extruder_multi_material");
 
 // 		$optgroup->on_change(sub{
 // 			my($opt_key, $value) = @_;
@@ -786,7 +785,7 @@ void TabPrinter::build()
 		{
 		optgroup = page->new_optgroup("USB/Serial connection");
 			line = {"Serial port", ""};
-			Option serial_port = get_option("serial_port");
+			Option serial_port = optgroup->get_option("serial_port");
 			serial_port.side_widget = ([](wxWindow* parent){
 				auto btn = new wxBitmapButton(parent, wxID_ANY, wxBitmap(wxString::FromUTF8(Slic3r::var("arrow_rotate_clockwise.png").c_str()), wxBITMAP_TYPE_PNG),
 					wxDefaultPosition, wxDefaultSize, wxBORDER_NONE);
@@ -797,7 +796,7 @@ void TabPrinter::build()
 				btn->Bind(wxEVT_BUTTON, [](wxCommandEvent e) {/*_update_serial_ports*/; });
 				return sizer;
 			});
-			Option serial_speed = get_option("serial_speed");
+			Option serial_speed = optgroup->get_option("serial_speed");
 			//! this serial_port & serial_speed have to be config !??
 			auto serial_test = [this, serial_port, serial_speed](wxWindow* parent){
 				auto btn = serial_test_btn = new wxButton(parent, wxID_ANY,
@@ -892,61 +891,61 @@ void TabPrinter::build()
 			return sizer;
 		};
 
-		Line host_line = optgroup->create_single_option_line(get_option("octoprint_host"));
+		Line host_line = optgroup->create_single_option_line("octoprint_host");
 		host_line.append_widget(octoprint_host_browse);
 		host_line.append_widget(octoprint_host_test);
 		optgroup->append_line(host_line);
-		optgroup->append_single_option_line(get_option("octoprint_apikey"));
+		optgroup->append_single_option_line("octoprint_apikey");
 
 		optgroup = page->new_optgroup("Firmware");
-		optgroup->append_single_option_line(get_option("gcode_flavor"));
+		optgroup->append_single_option_line("gcode_flavor");
 
 		optgroup = page->new_optgroup("Advanced");
-		optgroup->append_single_option_line(get_option("use_relative_e_distances"));
-		optgroup->append_single_option_line(get_option("use_firmware_retraction"));
-		optgroup->append_single_option_line(get_option("use_volumetric_e"));
-		optgroup->append_single_option_line(get_option("variable_layer_height"));
+		optgroup->append_single_option_line("use_relative_e_distances");
+		optgroup->append_single_option_line("use_firmware_retraction");
+		optgroup->append_single_option_line("use_volumetric_e");
+		optgroup->append_single_option_line("variable_layer_height");
 
 	page = add_options_page("Custom G-code", "cog.png");
 		optgroup = page->new_optgroup("Start G-code", 0);
-		option = get_option("start_gcode");
+		option = optgroup->get_option("start_gcode");
 		option.opt.full_width = true;
 		option.opt.height = 150;
 		optgroup->append_single_option_line(option);
 
 		optgroup = page->new_optgroup("End G-code", 0);
-		option = get_option("end_gcode");
+		option = optgroup->get_option("end_gcode");
 		option.opt.full_width = true;
 		option.opt.height = 150;
 		optgroup->append_single_option_line(option);
 
 		optgroup = page->new_optgroup("Before layer change G-code", 0);
-		option = get_option("before_layer_gcode");
+		option = optgroup->get_option("before_layer_gcode");
 		option.opt.full_width = true;
 		option.opt.height = 150;
 		optgroup->append_single_option_line(option);
 
 		optgroup = page->new_optgroup("After layer change G-code", 0);
-		option = get_option("layer_gcode");
+		option = optgroup->get_option("layer_gcode");
 		option.opt.full_width = true;
 		option.opt.height = 150;
 		optgroup->append_single_option_line(option);
 
 		optgroup = page->new_optgroup("Tool change G-code", 0);
-		option = get_option("toolchange_gcode");
+		option = optgroup->get_option("toolchange_gcode");
 		option.opt.full_width = true;
 		option.opt.height = 150;
 		optgroup->append_single_option_line(option);
 
 		optgroup = page->new_optgroup("Between objects G-code (for sequential printing)", 0);
-		option = get_option("between_objects_gcode");
+		option = optgroup->get_option("between_objects_gcode");
 		option.opt.full_width = true;
 		option.opt.height = 150;
 		optgroup->append_single_option_line(option);
 	
 	page = add_options_page("Notes", "note.png");
 		optgroup = page->new_optgroup("Notes", 0);
-		option = get_option("printer_notes");
+		option = optgroup->get_option("printer_notes");
 		option.opt.full_width = true;
 		option.opt.height = 250;
 		optgroup->append_single_option_line(option);
@@ -972,38 +971,38 @@ void TabPrinter::build_extruder_pages(){
 		extruder_pages.push_back(page);
 			
 			auto optgroup = page->new_optgroup("Size");
-			optgroup->append_single_option_line(get_option("nozzle_diameter", extruder_idx));
+			optgroup->append_single_option_line("nozzle_diameter", extruder_idx);
 		
 			optgroup = page->new_optgroup("Layer height limits");
-			optgroup->append_single_option_line(get_option("min_layer_height", extruder_idx));
-			optgroup->append_single_option_line(get_option("max_layer_height", extruder_idx));
+			optgroup->append_single_option_line("min_layer_height", extruder_idx);
+			optgroup->append_single_option_line("max_layer_height", extruder_idx);
 				
 		
 			optgroup = page->new_optgroup("Position (for multi-extruder printers)");
-			optgroup->append_single_option_line(get_option("extruder_offset", extruder_idx));
+			optgroup->append_single_option_line("extruder_offset", extruder_idx);
 		
 			optgroup = page->new_optgroup("Retraction");
-			optgroup->append_single_option_line(get_option("retract_length", extruder_idx));
-			optgroup->append_single_option_line(get_option("retract_lift", extruder_idx));
+			optgroup->append_single_option_line("retract_length", extruder_idx);
+			optgroup->append_single_option_line("retract_lift", extruder_idx);
 				Line line = { "Only lift Z", "" };
-				line.append_option(get_option("retract_lift_above", extruder_idx));
-				line.append_option(get_option("retract_lift_below", extruder_idx));
+				line.append_option(optgroup->get_option("retract_lift_above", extruder_idx));
+				line.append_option(optgroup->get_option("retract_lift_below", extruder_idx));
 				optgroup->append_line(line);
 			
-			optgroup->append_single_option_line(get_option("retract_speed", extruder_idx));
-			optgroup->append_single_option_line(get_option("deretract_speed", extruder_idx));
-			optgroup->append_single_option_line(get_option("retract_restart_extra", extruder_idx));
-			optgroup->append_single_option_line(get_option("retract_before_travel", extruder_idx));
-			optgroup->append_single_option_line(get_option("retract_layer_change", extruder_idx));
-			optgroup->append_single_option_line(get_option("wipe", extruder_idx));
-			optgroup->append_single_option_line(get_option("retract_before_wipe", extruder_idx));
+			optgroup->append_single_option_line("retract_speed", extruder_idx);
+			optgroup->append_single_option_line("deretract_speed", extruder_idx);
+			optgroup->append_single_option_line("retract_restart_extra", extruder_idx);
+			optgroup->append_single_option_line("retract_before_travel", extruder_idx);
+			optgroup->append_single_option_line("retract_layer_change", extruder_idx);
+			optgroup->append_single_option_line("wipe", extruder_idx);
+			optgroup->append_single_option_line("retract_before_wipe", extruder_idx);
 	
 			optgroup = page->new_optgroup("Retraction when tool is disabled (advanced settings for multi-extruder setups)");
-			optgroup->append_single_option_line(get_option("retract_length_toolchange", extruder_idx));
-			optgroup->append_single_option_line(get_option("retract_restart_extra_toolchange", extruder_idx));
+			optgroup->append_single_option_line("retract_length_toolchange", extruder_idx);
+			optgroup->append_single_option_line("retract_restart_extra_toolchange", extruder_idx);
 
 			optgroup = page->new_optgroup("Preview");
-			optgroup->append_single_option_line(get_option("extruder_colour", extruder_idx));
+			optgroup->append_single_option_line("extruder_colour", extruder_idx);
 	}
  
 	// # remove extra pages
diff --git a/xs/src/slic3r/GUI/Tab.h b/xs/src/slic3r/GUI/Tab.h
index eb2eb557d..4e4d41b15 100644
--- a/xs/src/slic3r/GUI/Tab.h
+++ b/xs/src/slic3r/GUI/Tab.h
@@ -140,9 +140,6 @@ public:
 	void			update_dirty();
 	void			load_config(DynamicPrintConfig config);
 
-	Option		get_option(const std::string title, int idx = -1){
-		return Option(*m_config_def->get(title), idx == -1 ? title : title + std::to_string(idx));
-	}	
 };
 
 //Slic3r::GUI::Tab::Print;