Merge branch 'new-ks-orwell' into route_prog_rework

42 files changed, 3975 insertions, 517 deletions

diff --git a/.build.yml b/.build.yml
index 303348f..54768a9 100644
--- a/.build.yml
+++ b/.build.yml
@@ -1,48 +1,29 @@
 image: debian/stable
 packages: 
 - git
-- curl
-- minetest-server
-- unzip
-- wget
-- lua-busted
+- lua5.1
+- luarocks
 sources :
 - https://git.sr.ht/~gpcf/advtrains
 
+artifacts:
+- advtrains.luacov.report.out
+- advtrains_interlocking.luacov.report.out
+
 tasks:
 
-- download_mt_server: |
-    mkdir bin
-    wget https://lifomaps.de/advtrains-test/builtin.tar.gz
-    tar xf builtin.tar.gz
-    curl https://lifomaps.de/advtrains-test/minetestserver -o ~/bin/minetestserver
-    chmod +x ~/bin/minetestserver
-- install_mt_game : |
-    curl -L https://github.com/minetest/minetest_game/archive/master.zip -o master.zip
-    mkdir -p .minetest/games/
-    cd .minetest/games
-    unzip ../../master.zip
-    mv minetest_game-master minetest_game
-- install_test_world: |
-    mkdir -p .minetest/worlds/
-    curl https://lifomaps.de/advtrains-test/testworld.tar.gz -o ~/testworld.tar.gz
-    cd .minetest/worlds/
-    tar xf ../../testworld.tar.gz
+- install_mineunit : |
+    for i in {busted,luacov}; do
+        luarocks install --local --lua-version 5.1 $i >/dev/null
+    done
+    luarocks install --local --lua-version 5.1 --server=https://luarocks.org/dev mineunit
 - run_unit_tests : |
-    cd advtrains/advtrains
-    busted
-    cd ../advtrains_interlocking
-    busted
-    cd ../serialize_lib
-    busted
-- activate_test_env: |
-    cd advtrains
-    git merge --no-commit origin/luaatcdebug
-- install_advtrains : |
-    mkdir .minetest/mods
-    cp -r advtrains .minetest/mods
-    cd .minetest/mods
-    git clone https://git.bananach.space/basic_trains.git/
-- run_test_world: | 
-    echo "bind_address = 127.0.0.1" > minetest.conf
-    ~/bin/minetestserver --port 31111 --gameid minetest_game --config ~/minetest.conf --world ~/.minetest/worlds/advtrains_testworld
+    cd advtrains/serialize_lib
+    ~/.luarocks/bin/busted
+    for i in {advtrains,advtrains_interlocking}; do
+        cd ../$i
+        ~/.luarocks/bin/mineunit -c
+        ~/.luarocks/bin/mineunit -r
+        sed -n '/^File/,$p' luacov.report.out
+        mv luacov.report.out ~/$i.luacov.report.out
+    done
diff --git a/.gitignore b/.gitignore
index b3180de..bef77f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 ## Eclipse project files & directories
 .project
 .settings
+luacov.*
diff --git a/advtrains/formspec.lua b/advtrains/formspec.lua
new file mode 100644
index 0000000..8894354
--- /dev/null
+++ b/advtrains/formspec.lua
@@ -0,0 +1,111 @@
+local sformat = string.format
+local fsescape = minetest.formspec_escape
+
+local function make_list(entries)
+	local t = {}
+	for k, v in ipairs(entries) do
+		t[k] = fsescape(v)
+	end
+	return table.concat(t, ",")
+end
+
+local function S_wrapper(f, i0)
+	return function(...)
+		local args = {...}
+		args[i0] = attrans(unpack(args,i0))
+		return f(unpack(args,1,i0))
+	end
+end
+
+local function f_button(x, y, w, id, text)
+	return sformat("button[%f,%f;%f,0.75;%s;%s]", x, y, w, id, text)
+end
+
+local function f_checkbox(x, y, name, selected, label)
+	return sformat("checkbox[%f,%f;%s;%s;%s]", x, y+0.25, name, label, selected and "true" or "false")
+end
+
+local function f_button_exit(x, y, w, id, text)
+	return sformat("button_exit[%f,%f;%f,0.75;%s;%s]", x, y, w, id, text)
+end
+
+local function f_dropdown(x, y, w, id, entries, sel, indexed)
+	return sformat("dropdown[%f,%f;%f,0.75;%s;%s;%d%s]",
+		x, y, w, id, make_list(entries),
+		sel or 1,
+		indexed and ";true" or "")
+end
+
+local function f_image_button(x, y, w, h, texture, id, label, noclip, drawborder, pressed)
+	local st = {string.format("%f,%f;%f,%f;%s;%s;%s", x, y, w, h, fsescape(texture), fsescape(id), fsescape(label))}
+	if pressed then
+		st[#st+1] = tostring(noclip or false)
+		st[#st+1] = tostring(drawborder or false)
+		st[#st+1] = fsescape(pressed)
+	end
+	return sformat("image_button[%s]", table.concat(st, ";"))
+end
+
+local function f_image_button_exit(x, y, w, h, texture, id, label)
+	local st = {string.format("%f,%f;%f,%f;%s;%s;%s", x, y, w, h, fsescape(texture), fsescape(id), fsescape(label))}
+	return sformat("image_button_exit[%s]", table.concat(st, ";"))
+end
+
+local function f_label(x, y, text)
+	return sformat("label[%f,%f;%s]", x, y+0.25, fsescape(text))
+end
+
+local function f_field_aux(x, y, w, id, default)
+	return sformat("field[%f,%f;%f,0.75;%s;;%s]", x, y, w, id, default)
+end
+
+local function f_field(x, y, w, id, label, default)
+	return f_label(x, y-0.5, label) .. f_field_aux(x, y, w, id, default)
+end
+
+local function f_tabheader(x, y, w, h, id, entries, sel, transparent, border)
+	local st = {string.format("%f,%f",x, y)}
+	if h then
+		if w then
+			st[#st+1] = string.format("%f,%f", w, h)
+		else
+			st[#st+1] = tostring(h)
+		end
+	end
+	st[#st+1] = tostring(id)
+	st[#st+1] = make_list(entries)
+	st[#st+1] = tostring(sel)
+	if transparent ~= nil then
+		st[#st+1] = tostring(transparent)
+		if border ~= nil then
+			st[#st+1] = tostring(border)
+		end
+	end
+	return string.format("tabheader[%s]", table.concat(st, ";"))
+end
+
+local function f_textlist(x, y, w, h, id, entries, sel, transparent)
+	local st = {string.format("%f,%f;%f,%f;%s;%s", x, y, w, h, id, make_list(entries))}
+	if sel then
+		st[#st+1] = tostring(sel)
+		st[#st+1] = tostring(transparent or false)
+	end
+	return string.format("textlist[%s]", table.concat(st, ";"))
+end
+
+return {
+	button = f_button,
+	S_button = S_wrapper(f_button, 5),
+	checkbox = f_checkbox,
+	S_checkbox = S_wrapper(f_checkbox, 5),
+	button_exit = f_button_exit,
+	S_button_exit = S_wrapper(f_button_exit, 5),
+	dropdown = f_dropdown,
+	field = f_field,
+	image_button = f_image_button,
+	image_button_exit = f_image_button_exit,
+	label = f_label,
+	S_label = S_wrapper(f_label, 3),
+	tabheader = f_tabheader,
+	textlist = f_textlist,
+}
diff --git a/advtrains/init.lua b/advtrains/init.lua
index a5f12f7..3bd8374 100644
--- a/advtrains/init.lua
+++ b/advtrains/init.lua
@@ -24,6 +24,9 @@ minetest.log("action", "[advtrains] Loading...")
 
 -- There is no need to support 0.4.x anymore given that the compatitability with it is already broken by 1bb1d825f46af3562554c12fba35a31b9f7973ff
 attrans = minetest.get_translator ("advtrains")
+function attrans_formspec(...)
+	return minetest.formspec_escape(attrans(...))
+end
 
 --advtrains
 advtrains = {trains={}, player_to_train_mapping={}}
@@ -199,6 +202,7 @@ advtrains.meseconrules =
 advtrains.fpath=minetest.get_worldpath().."/advtrains"
 
 advtrains.speed = dofile(advtrains.modpath.."/speed.lua")
+advtrains.formspec = dofile(advtrains.modpath.."/formspec.lua")
 
 dofile(advtrains.modpath.."/path.lua")
 dofile(advtrains.modpath.."/trainlogic.lua")
diff --git a/advtrains_interlocking/README.md b/advtrains_interlocking/README.md
new file mode 100644
index 0000000..d4a2699
--- /dev/null
+++ b/advtrains_interlocking/README.md
@@ -0,0 +1,85 @@
+# Interlocking for Advtrains
+
+The `advtrains_interlocking` mod provides various interlocking and signaling features for Advtrains.
+
+## Signal aspect tables
+
+Signal aspects are represented using tables with the following (optional) fields:
+
+* `main`: The main signal aspect. It provides information on the permitted speed after passing the signal.
+* `dst`: The distant signal aspect. It provides information on the permitted speed after passing the next signal.
+* `shunt`: Whether the train may proceed in shunt mode and, if the main aspect is danger, proceed in shunt mode.
+* `proceed_as_main`: Whether the train should exit shunt mode when proceeding.
+* `group`: The name of the signal group.
+* `name`: The name of the signal aspect.
+
+The `main` and `dst` fields may be:
+
+* An positive number indicating the permitted speed,
+* The number 0, indicating that the train should expect to stop at the current signal (or, for the `dst` field, the next signal),
+* The number -1, indicating that the train can proceed (or, for the `dst` field, expect to proceed) at maximum speed,
+* The constant `false`, indicating no change to the speed restriction, or
+* The constant `nil`, indicating that the default value for the name aspect (if present) is used. If no valid signal aspect is named, or the signal aspect does not provide a default value, the value is assumed to be `false`.
+
+### Node definitions
+
+Signals should belong the following node groups:
+
+* `advtrains_signal`: `1` for static signals, `2` for signals with variable aspects.
+* `save_in_at_nodedb`: This should be set to `1` to make sure that Advtrains always has access to the signal.
+* `not_blocking_trains`: Setting this to `1` prevents trains from colliding with the signal. Setting this is not necessary, but recommended.
+
+The node definition should contain an `advtrains` field.
+
+The `advtrains` field of the node definition should contain a `supported_aspects` table for signals with variable aspects.
+
+The `supported_aspects` table should contain the following fields:
+
+* `main`: A list of values supported for the main aspect.
+* `dst`: A list of values supported for the distant aspect.
+* `shunt`: The value for the `shunt` field of the signal aspect or `nil` if the value is variable.
+* `proceed_as_main`: The value for the `proceed_as_main` field of the signal aspect.
+* `group`: The name of the signal group.
+* `name`: A list of supported (named) aspects.
+* `dst_shift`: The phase shift for distant/repeater signals. This field should not be set for main signals.
+
+The `advtrains` field of the node definition should contain a `get_aspect` function. This function is given the position of the signal and the node at the position. It should return the signal aspect table or, in the case of type 2 signals, the name of the signal aspect.
+
+For signals with variable aspects, a corresponding `set_aspect` function should also be defined. This function is given the position of the signal, the node at the position, and the new aspect. The new aspect is not guaranteed to be supported by the signal itself.
+
+Signals should also have the following callbacks set:
+
+* `on_rightclick` should be set to `advtrains.interlocking.signal_rc_handler`
+* `can_dig` should be set to `advtrains.interlocking.signal_can_dig`
+* `after_dig_node` should be set to `advtrains.interlocking.signal_after_dig`
+
+Alternatively, custom callbacks should call the respective functions.
+
+## Signal groups
+
+Signals may belong to signal groups are registered using `advtrains.interlocking.aspect.register_group`.
+
+Signal group definitions include the following fields:
+
+* `name`: The internal name of the signal group. It is recommended to use the mod name as a prefix to avoid name collisions.
+* `label`: The description of the signal group.
+* `aspects`: A table of signal aspects. Entries with string indices define the signal aspect with the name. Entries with numeric indices (starting from 1, counting upward) contain a list of corresponding aspect names (the first entry is preferred) and are mainly used for routing, where larger indices indicate that the signal with the aspect is closer to the signal with the "danger" (or similar) aspect.
+
+Each aspect in the signal group definition table should contain the following fields:
+
+* `label`: The description of the signal aspect.
+* `main`, `shunt`, `proceed_as_main`: The default values for the aspect. Note that the `dst` field has no default value as it is automatically adjusted.
+
+## Notes
+
+It is allowed to provide other methods of setting the signal aspect. However:
+
+* These changes are ignored by the routesetting system.
+* Please call `advtrains.interlocking.signal_readjust_aspect` after the signal aspect has changed.
+
+## Examples
+An example of speed signals can be found in `advtrains_signals_ks`, which provides a subset of German signals.
+
+An example of route signals can be found in `advtrains_signals_japan`, which provides a subset of Japanese signals.
+
+The mods mentioned above are also used for demonstation purposes and can also be used for testing.
diff --git a/advtrains_interlocking/aspect.lua b/advtrains_interlocking/aspect.lua
new file mode 100644
index 0000000..c7d5c81
--- /dev/null
+++ b/advtrains_interlocking/aspect.lua
@@ -0,0 +1,296 @@
+--- Signal aspect handling.
+-- @module advtrains.interlocking.aspect
+
+local registered_groups = {}
+
+local default_aspect = {
+	main = false,
+	dst = false,
+	shunt = true,
+	proceed_as_main = false,
+}
+
+local signal_aspect = {}
+
+local signal_aspect_metatable = {
+	__eq = function(asp1, asp2)
+		for _, k in pairs {"main", "dst", "shunt", "proceed_as_main"} do
+			local v1, v2 = (asp1[k] or false), (asp2[k] or false)
+			if v1 ~= v2 then
+				return false
+			end
+		end
+		if asp1.group and asp1.group == asp2.group then
+			return asp1.name == asp2.name
+		end
+		return true
+	end,
+	__index = function(asp, field)
+		local val = signal_aspect[field]
+		if val then
+			return val
+		end
+		val = default_aspect[field]
+		if val == nil then
+			return nil
+		end
+		local group = registered_groups[rawget(asp, "group")]
+		if group then
+			local aspdef = group.aspects[rawget(asp, "name")]
+			if aspdef[field] ~= nil then
+				val = aspdef[field]
+			end
+		end
+		return val
+	end,
+	__tostring = function(asp)
+		local st = {}
+		if asp.group and asp.name then
+			table.insert(st, ("%q in %q"):format(asp.name, asp.group))
+		end
+		if asp.main then
+			table.insert(st, ("current %d"):format(asp.main))
+		end
+		if asp.main ~= 0 then
+			if asp.dst then
+				table.insert(st, string.format("next %d", asp.dst))
+			end
+		end
+		if asp.main ~= 0 and asp.proceed_as_main then
+			table.insert(st, "proceed as main")
+		end
+		return ("[%s]"):format(table.concat(st, ", "))
+	end,
+}
+
+local function quicknew(t)
+	return setmetatable(t, signal_aspect_metatable)
+end
+
+--- Signal aspect class.
+-- @type signal_aspect
+
+--- Return a plain version of the signal aspect.
+-- @param[opt=false] raw Bypass metamethods when fetching signal aspects
+-- @return A plain copy of the signal aspect object.
+function signal_aspect:plain(raw)
+	local t = {}
+	for _, k in pairs {"main", "dst", "shunt", "proceed_as_main", "group", "name"} do
+		local v
+		if raw then
+			v = rawget(self, k)
+		else
+			v = self[k]
+		end
+		t[k] = v
+	end
+	return t
+end
+
+--- Create (or copy) a signal aspect object.
+-- Note that signal aspect objects can also be created by calling the `advtrains.interlocking.aspect` table.
+-- @return The newly created signal aspect object.
+function signal_aspect:new()
+	if type(self) ~= "table" then
+		return quicknew{}
+	end
+	local newasp = {}
+	for _, k in pairs {"main", "dst"} do
+		if type(self[k]) == "table" then
+			if self[k].free then
+				newasp[k] = self[k].speed
+			else
+				newasp[k] = 0
+			end
+		else
+			newasp[k] = self[k]
+		end
+	end
+	if type(self.shunt) == "table" then
+		newasp.shunt = self.shunt.free
+		newasp.proceed_as_main = self.shunt.proceed_as_main
+	else
+		newasp.shunt = self.shunt
+	end
+	for _, k in pairs {"group", "name"} do
+		newasp[k] = self[k]
+	end
+	return quicknew(newasp)
+end
+
+--- Modify the signal aspect in-place to fit in the specific signal group.
+-- @param group The signal group. The `nil` indicates a generic group.
+-- @return The (now modified) signal aspect itself.
+function signal_aspect:to_group(group)
+	local cg = self.group
+	local gdef = registered_groups[group]
+	if type(self.name) ~= "string" then
+		self.name = nil
+	end
+	if not gdef then
+		for k in pairs(default_aspect) do
+			rawset(self, k, self[k])
+		end
+		self.group = nil
+		self.name = nil
+		return self
+	elseif cg == group and gdef.aspects[self.name] then
+		return self
+	end
+	local newidx = 1
+	if self.main == 0 then
+		newidx = #gdef.aspects
+	end
+	local cgdef = registered_groups[cg]
+	if cgdef then
+		local idx = (cgdef.aspects[self.name] or {}).index
+		if idx then
+			if idx >= #cgdef.aspects then
+				idx = #gdef.aspects
+			elseif idx >= #gdef.aspects then
+				idx = #gdef.aspects-1
+			end
+			newidx = idx
+		end
+	end
+	self.group = group
+	self.name = gdef.aspects[newidx][1]
+	return self
+end
+
+--- Modify the signal aspect in-place to indicate a specific distant aspect.
+-- @param dst The distant aspect
+-- @param[opt=1] shift The phase shift of the current signal.
+-- @return The (now modified) signal aspect itself.
+function signal_aspect:adjust_distant(dst, shift)
+	if (shift or -1) < 0 then
+		shift = 1
+	end
+	if not dst then
+		self.dst = nil
+		return self
+	end
+	if self.main ~= 0 then
+		self.dst = dst.main
+	else
+		self.dst = nil
+		return self
+	end
+	local dgdef = registered_groups[dst.group]
+	if dgdef then
+		if self.group == dst.group and shift == 0 then
+			self.name = dst.name
+		else
+			local idx = (dgdef.aspects[dst.name] or {}).index
+			if idx then
+				idx = math.max(idx-shift, 1)
+				self.group = dst.group
+				self.name = dgdef.aspects[idx][1]
+			end
+		end
+	end
+	return self
+end
+
+--- Signal groups.
+-- @section signal_group
+
+--- Register a signal group.
+-- @function register_group
+-- @param def The definition table.
+local function register_group(def)
+	local t = {}
+	local name = def.name
+	if type(name) ~= "string" then
+		return error("Expected signal group name to be a string, got " .. type(name))
+	elseif registered_groups[name] then
+		return error(string.format("Attempt to redefine signal group %q, previously defined in %s", name, registered_groups[name].defined))
+	end
+	t.name = name
+
+	t.defined = debug.getinfo(2, "S").short_src or "[?]"
+
+	local label = def.label or name
+	if type(label) ~= "string" then
+		return error("Label is not a string")
+	end
+	t.label = label
+
+	local mainasps = {}
+	for idx, asp in pairs(def.aspects) do
+		local idxtp = type(idx)
+		if idxtp == "string" then
+			local t = {}
+			t.name = idx
+
+			local label = asp.label or idx
+			if type(label) ~= "string" then
+				return error("Aspect label is not a string")
+			end
+			t.label = label
+
+			for _, k in pairs{"main", "dst", "shunt"} do
+				t[k] = asp[k]
+			end
+
+			mainasps[idx] = t
+		end
+	end
+	if #def.aspects < 2 then
+		return error("Insufficient entries in signal aspect list")
+	end
+	for idx, asplist in ipairs(def.aspects) do
+		if type(asplist) ~= "table" then
+			asplist = {asplist}
+		else
+			asplist = table.copy(asplist)
+		end
+		if #asplist < 1 then
+			error("Invalid entry in signal aspect list")
+		end
+		for _, k in ipairs(asplist) do
+			if type(k) ~= "string" then
+				return error("Invalid signal aspect ID")
+			end
+			local asp = mainasps[k]
+			if not asp then
+				return error("Invalid signal aspect ID")
+			end
+			if asp.index ~= nil then
+				return error("Attempt to assign a signal aspect to multiple numeric indices")
+			end
+			asp.index = idx
+		end
+		mainasps[idx] = asplist
+	end
+	t.aspects = mainasps
+
+	registered_groups[name] = t
+end
+
+--- Get the definition of a signal group.
+-- @function get_group_definition
+-- @param name The name of the signal group.
+-- @return[1] The definition for the signal group (if present).
+-- @return[2] The nil constant (otherwise).
+local function get_group_definition(name)
+	local t = registered_groups[name]
+	if t then
+		return table.copy(t)
+	else
+		return nil
+	end
+end
+
+local lib = {
+	register_group = register_group,
+	get_group_definition = get_group_definition,
+}
+
+local libmt = {
+	__call = function(_, ...)
+		return signal_aspect.new(...)
+	end,
+}
+
+return setmetatable(lib, libmt)
diff --git a/advtrains_interlocking/database.lua b/advtrains_interlocking/database.lua
index 17a4199..4213c3d 100644
--- a/advtrains_interlocking/database.lua
+++ b/advtrains_interlocking/database.lua
@@ -150,6 +150,9 @@ function ildb.load(data)
 		advtrains.interlocking.npr_rails = data.npr_rails
 	end
 	
+	-- let signal_api load data
+	advtrains.interlocking.signal.load(data)
+	
 	--COMPATIBILITY to Signal aspect format
 	-- TODO remove in time...
 	for pts,tcb in pairs(track_circuit_breaks) do
@@ -183,7 +186,7 @@ function ildb.load(data)
 end
 
 function ildb.save()
-	return {
+	local data = {
 		tcbs = track_circuit_breaks,
 		ts=track_sections,
 		signalass = signal_assignments,
@@ -193,6 +196,8 @@ function ildb.save()
 		npr_rails = advtrains.interlocking.npr_rails,
 		tcbpts_conversion_applied = true, -- remark that legacy pos conversion has taken place
 	}
+	advtrains.interlocking.signal.save(data)
+	return data
 end
 
 --
diff --git a/advtrains_interlocking/demosignals.lua b/advtrains_interlocking/demosignals.lua
index 1c1b8b2..de6926a 100644
--- a/advtrains_interlocking/demosignals.lua
+++ b/advtrains_interlocking/demosignals.lua
@@ -50,7 +50,7 @@ minetest.register_node("advtrains_interlocking:ds_danger", {
 	},
 	on_rightclick = advtrains.interlocking.signal_rc_handler,
 	can_dig = advtrains.interlocking.signal_can_dig,
-	after_dig_node = advtrains.interlocking.signal_after_dig,
+	after_destruct = advtrains.interlocking.signal_after_dig,
 })
 minetest.register_node("advtrains_interlocking:ds_free", {
 	description = "Demo signal at Free",
@@ -71,7 +71,7 @@ minetest.register_node("advtrains_interlocking:ds_free", {
 	},
 	on_rightclick = advtrains.interlocking.signal_rc_handler,
 	can_dig = advtrains.interlocking.signal_can_dig,
-	after_dig_node = advtrains.interlocking.signal_after_dig,
+	after_destruct = advtrains.interlocking.signal_after_dig,
 })
 minetest.register_node("advtrains_interlocking:ds_slow", {
 	description = "Demo signal at Slow",
@@ -92,6 +92,6 @@ minetest.register_node("advtrains_interlocking:ds_slow", {
 	},
 	on_rightclick = advtrains.interlocking.signal_rc_handler,
 	can_dig = advtrains.interlocking.signal_can_dig,
-	after_dig_node = advtrains.interlocking.signal_after_dig,
+	after_destruct = advtrains.interlocking.signal_after_dig,
 })
 
diff --git a/advtrains_interlocking/distant.lua b/advtrains_interlocking/distant.lua
new file mode 100644
index 0000000..32ada82
--- /dev/null
+++ b/advtrains_interlocking/distant.lua
@@ -0,0 +1,200 @@
+--- Distant signaling.
+-- This module implements a database backend for distant signal assignments.
+-- The actual modifications to signal aspects are still done by signal aspect accessors.
+-- @module advtrains.interlocking.distant
+
+local db_distant = {}
+local db_distant_of = {}
+
+local pts = advtrains.encode_pos
+local stp = advtrains.decode_pos
+
+--- Replace the distant signal assignment database.
+-- @function load
+-- @param db The new database to load.
+local function db_load(x)
+	if type(x) ~= "table" then
+		return
+	end
+	db_distant = x.distant
+	db_distant_of = x.distant_of
+end
+
+--- Retrieve the current distant signal assignment database.
+-- @function save
+-- @return The current database.
+local function db_save()
+	return {
+		distant = db_distant,
+		distant_of = db_distant_of,
+	}
+end
+
+local update_signal, update_main, update_dst
+
+--- Unassign a distant signal.
+-- @function unassign_dst
+-- @param dst The position of the distant signal.
+-- @param[opt=false] force Whether to skip callbacks.
+local function unassign_dst(dst, force)
+	local pts_dst = pts(dst)
+	local main = db_distant_of[pts_dst]
+	db_distant_of[pts_dst] = nil
+	if main then
+		local pts_main = main[1]
+		local t = db_distant[pts_main]
+		if t then
+			t[pts_dst] = nil
+		end
+	end
+	if not force then
+		update_dst(dst)
+	end
+end
+
+--- Unassign a main signal.
+-- @function unassign_main
+-- @param main The position of the main signal.
+-- @param[opt=false] force Whether to skip callbacks.
+local function unassign_main(main, force)
+	local pts_main = pts(main)
+	local t = db_distant[pts_main]
+	if not t then
+		return
+	end
+	for pts_dst in pairs(t) do
+		local realmain = db_distant_of[pts_dst]
+		if realmain and realmain[1] == pts_main then
+			db_distant_of[pts_dst] = nil
+			if not force then
+				local dst = stp(pts_dst)
+				update_dst(dst)
+			end
+		end
+	end
+	db_distant[pts_main] = nil
+end
+
+--- Remove all (main and distant) signal assignments from a signal.
+-- @function unassign_all
+-- @param pos The position of the signal.
+-- @param[opt=false] force Whether to skip callbacks.
+local function unassign_all(pos, force)
+	unassign_main(pos)
+	unassign_dst(pos, force)
+end
+
+--- Check whether a signal is "appropriate" for the distant signal system.
+-- Currently, a signal is considered appropriate if its signal aspect can be set.
+-- @function appropriate_signal
+-- @param pos The position of the signal
+local function appropriate_signal(pos)
+	local node = advtrains.ndb.get_node(pos)
+	local ndef = minetest.registered_nodes[node.name] or {}
+	if not ndef then
+		return false
+	end
+	local atdef = ndef.advtrains
+	if not atdef then
+		return false
+	end
+	return atdef.supported_aspects and atdef.set_aspect and true
+end
+
+--- Assign a distant signal to a main signal.
+-- @function assign
+-- @param main The position of the main signal.
+-- @param dst The position of the distant signal.
+-- @param[opt="manual"] by The method of assignment.
+-- @param[opt=false] skip_update Whether to skip callbacks.
+local function assign(main, dst, by, skip_update)
+	if not (appropriate_signal(main) and appropriate_signal(dst)) then
+		return
+	end
+	local pts_main = pts(main)
+	local pts_dst = pts(dst)
+	local t = db_distant[pts_main]
+	if not t then
+		t = {}
+		db_distant[pts_main] = t
+	end
+	if not by then
+		by = "manual"
+	end
+	unassign_dst(dst, true)
+	t[pts_dst] = by
+	db_distant_of[pts_dst] = {pts_main, by}
+	if not skip_update then
+		update_dst(dst)
+	end
+end
+
+--- Get the distant signals assigned to a main signal.
+-- @function get_distant
+-- @param main The position of the main signal.
+-- @treturn {[pos]=by,...} A table of distant signals, with the positions encoded using `advtrains.encode_pos`.
+local function get_distant(main)
+	local pts_main = pts(main)
+	return db_distant[pts_main] or {}
+end
+
+--- Get the main signal assigned the a distant signal.
+-- @function get_main
+-- @param dst The position of the distant signal.
+-- @return The position of the main signal.
+-- @return The method of assignment.
+local function get_main(dst)
+	local pts_dst = pts(dst)
+	local main = db_distant_of[pts_dst]
+	if not main then
+		return
+	end
+	if main[1] then
+		return stp(main[1]), unpack(main, 2)
+	else
+		return unpack(main)
+	end
+end
+
+--- Update all distant signals assigned to a main signal.
+-- @function update_main
+-- @param main The position of the main signal.
+update_main = function(main)
+	local pts_main = pts(main)
+	local t = get_distant(main)
+	for pts_dst in pairs(t) do
+		local dst = stp(pts_dst)
+		advtrains.interlocking.signal_readjust_aspect(dst)
+	end
+end
+
+--- Update the aspect of a distant signal.
+-- @function update_dst
+-- @param dst The position of the distant signal.
+update_dst = function(dst)
+	advtrains.interlocking.signal_readjust_aspect(dst)
+end
+
+--- Update the aspect of a combined (main and distant) signal and all distant signals assigned to it.
+-- @function update_signal
+-- @param pos The position of the signal.
+update_signal = function(pos)
+	update_main(pos)
+	update_dst(pos)
+end
+
+advtrains.distant = {
+	load = db_load,
+	save = db_save,
+	assign = assign,
+	unassign_dst = unassign_dst,
+	unassign_main = unassign_main,
+	unassign_all = unassign_all,
+	get_distant = get_distant,
+	get_dst = get_distant,
+	get_main = get_main,
+	update_main = update_main,
+	update_dst = update_dst,
+	update_signal = update_signal,
+	appropriate_signal = appropriate_signal,
+}
diff --git a/advtrains_interlocking/distant_ui.lua b/advtrains_interlocking/distant_ui.lua
new file mode 100644
index 0000000..bb66dc4
--- /dev/null
+++ b/advtrains_interlocking/distant_ui.lua
@@ -0,0 +1,141 @@
+local F = advtrains.formspec
+local D = advtrains.distant
+local I = advtrains.interlocking
+
+function I.make_short_dst_formspec_component(pos, x, y, w)
+	local main, set_by = D.get_main(pos)
+	if main then
+		local pts_main = minetest.pos_to_string(main)
+		local desc = attrans("The assignment is made with an unknown method.")
+		if set_by == "manual" then
+			desc = attrans("The assignment is made manually.")
+		elseif set_by == "routesetting" then
+			desc = attrans("The assignment is made by the routesetting system.")
+		end
+		return table.concat {
+			F.S_label(x, y, "This signal is a distant signal of @1.", pts_main),
+			F.label(x, y+0.5, desc),
+			F.S_button_exit(x, y+1, w/2-0.125, "dst_assign", "Reassign"),
+			F.S_button_exit(x+w/2+0.125, y+1, w/2-0.125, "dst_unassign", "Unassign"),
+		}
+	else
+		return table.concat {
+			F.S_label(x, y, "This signal is not assigned to a main signal."),
+			F.S_label(x, y+0.5, "The distant aspect of the signal is not used."),
+			F.S_button_exit(x, y+1, w, "dst_assign", "Assign")
+		}
+	end
+end
+
+function I.make_dst_list_formspec_component(pos, x, y, w, h)
+	local ymid = y+0.25+h/2
+	local dstlist = {}
+	for pos, _ in pairs(D.get_dst(pos)) do
+		table.insert(dstlist, minetest.pos_to_string(advtrains.decode_pos(pos)))
+	end
+	return table.concat {
+		F.S_label(x, y, "Distant signals:"),
+		F.textlist(x, y+0.5, w-1, h-0.5, "dstlist", dstlist),
+		F.image_button_exit(x+w-0.75, ymid-0.875, 0.75, 0.75, "cdb_add.png", "dst_add", ""),
+		F.image_button_exit(x+w-0.75, ymid+0.125, 0.75, 0.75, "cdb_clear.png", "dst_del", ""),
+	}
+end
+
+function I.make_dst_formspec_component(pos, x, y, w, h)
+	return I.make_short_dst_formspec_component(pos, x, y, w, h)
+		.. I.make_dst_list_formspec_component(pos, x, y+2, w, h-2)
+end
+
+function I.show_distant_signal_form(pos, pname)
+	return I.show_ip_form(pos, pname)
+end
+
+local signal_pos = {}
+local function init_signal_assignment(pname, pos)
+	if not minetest.check_player_privs(pname, "interlocking") then
+		minetest.chat_send_player(pname, attrans("This operation is not allowed without the @1 privilege.", "interlocking"))
+		return
+	end
+	if not D.appropriate_signal(pos) then
+		minetest.chat_send_player(pname, attrans("Incompatible signal."))
+		return
+	end
+	signal_pos[pname] = pos
+	minetest.chat_send_player(pname, attrans("Please punch the signal to use as the main signal."))
+end
+
+local distant_pos = {}
+local function init_distant_assignment(pname, pos)
+	if not minetest.check_player_privs(pname, "interlocking") then
+		minetest.send_chat_player(pname, attrans("This operation is now allowed without the @1 privilege.", "interlocking"))
+		return
+	end
+	if not D.appropriate_signal(pos) then
+		minetest.chat_send_player(pname, attrans("Incompatible signal."))
+		return
+	end
+	distant_pos[pname] = pos
+	minetest.chat_send_player(pname, attrans("Please punch the signal to use as the distant signal."))
+end
+
+minetest.register_on_punchnode(function(pos, node, player, pointed_thing)
+	local pname = player:get_player_name()
+	if not minetest.check_player_privs(pname, "interlocking") then
+		return
+	end
+	local spos = signal_pos[pname]
+	local distant = false
+	if not spos then
+		spos = distant_pos[pname]
+		if not spos then
+			return
+		end
+		distant = true
+	end
+	signal_pos[pname] = nil
+	distant_pos[pname] = nil
+	local is_signal = minetest.get_item_group(node.name, "advtrains_signal") >= 2
+	if not (is_signal and D.appropriate_signal(pos)) then
+		minetest.chat_send_player(pname, attrans("Incompatible signal."))
+		return
+	end
+	minetest.chat_send_player(pname, attrans("Successfully assigned signal."))
+	if distant then
+		D.assign(spos, pos, "manual")
+	else
+		D.assign(pos, spos, "manual")
+	end
+end)
+
+local dstsel = {}
+
+function advtrains.interlocking.handle_dst_formspec_fields(pname, pos, fields)
+	if not (pos and minetest.check_player_privs(pname, "interlocking")) then
+		return
+	end
+	if fields.dst_unassign then
+		D.unassign_dst(pos)
+	elseif fields.dst_assign then
+		init_signal_assignment(pname, pos)
+	elseif fields.dst_add then
+		init_distant_assignment(pname, pos)
+	elseif fields.dstlist then
+		dstsel[pname] = minetest.explode_textlist_event(fields.dstlist).index
+	elseif fields.dst_del then
+		local selid = dstsel[pname]
+		if selid then
+			local dsts = D.get_dst(pos)
+			local pos
+			for p, _ in pairs(dsts) do
+				selid = selid-1
+				if selid <= 0 then
+					pos = p
+					break
+				end
+			end
+			if pos then
+				D.unassign_dst(advtrains.decode_pos(pos))
+			end
+		end
+	end
+end
diff --git a/advtrains_interlocking/init.lua b/advtrains_interlocking/init.lua
index fe8b967..dd08b4a 100644
--- a/advtrains_interlocking/init.lua
+++ b/advtrains_interlocking/init.lua
@@ -1,5 +1,5 @@
--- Advtrains interlocking system
--- See database.lua for a detailed explanation
+--- Advtrains interlocking system.
+-- @module advtrains.interlocking
 
 advtrains.interlocking = {}
 
@@ -12,8 +12,14 @@ end
 
 local modpath = minetest.get_modpath(minetest.get_current_modname()) .. DIR_DELIM
 
+--advtrains.interlocking.aspect = dofile(modpath.."aspect.lua")
+
 dofile(modpath.."database.lua")
+dofile(modpath.."distant.lua")
+dofile(modpath.."distant_ui.lua")
+dofile(modpath.."signal_aspect_accessors.lua")
 dofile(modpath.."signal_api.lua")
+dofile(modpath.."signal_aspect_ui.lua")
 dofile(modpath.."demosignals.lua")
 dofile(modpath.."train_sections.lua")
 dofile(modpath.."route_prog.lua")
diff --git a/advtrains_interlocking/routesetting.lua b/advtrains_interlocking/routesetting.lua
index 64b8c25..24b3199 100644
--- a/advtrains_interlocking/routesetting.lua
+++ b/advtrains_interlocking/routesetting.lua
@@ -45,12 +45,17 @@ function ilrs.set_route(signal, route, try)
 	local rtename = route.name
 	local signalname = (ildb.get_tcbs(signal).signal_name or "") .. sigd_to_string(signal)
 	local c_tcbs, c_ts_id, c_ts, c_rseg, c_lckp
+	local signals = {}
+	local nodst
 	while c_sigd and i<=#route do
 		c_tcbs = ildb.get_tcbs(c_sigd)
 		if not c_tcbs then
 			if not try then atwarn("Did not find TCBS",c_sigd,"while setting route",rtename,"of",signal) end
 			return false, "No TCB found at "..sigd_to_string(c_sigd)..". Please update or reconfigure route!"
 		end
+		if i == 1 then
+			nodst = c_tcbs.nodst
+		end
 		c_ts_id = c_tcbs.ts_id
 		if not c_ts_id then
 			if not try then atwarn("Encountered End-Of-Interlocking while setting route",rtename,"of",signal) end
@@ -133,9 +138,9 @@ function ilrs.set_route(signal, route, try)
 			}
 			if c_tcbs.signal then
 				c_tcbs.route_committed = true
-				c_tcbs.aspect = route.aspect or advtrains.interlocking.GENERIC_FREE
+				c_tcbs.aspect = route.aspect or advtrains.interlocking.FULL_FREE
 				c_tcbs.route_origin = signal
-				advtrains.interlocking.update_signal_aspect(c_tcbs)
+				signals[#signals+1] = c_tcbs
 			end
 		end
 		-- advance
@@ -143,6 +148,27 @@ function ilrs.set_route(signal, route, try)
 		c_sigd = c_rseg.next
 		i = i + 1
 	end
+
+	-- Distant signaling
+	local lastsig = nil
+	if c_sigd then
+		local e_tcbs = ildb.get_tcbs(c_sigd)
+		local pos = e_tcbs and e_tcbs.signal
+		if pos then
+			lastsig = pos
+		end
+	end
+	for i = #signals, 1, -1 do
+		if lastsig then
+			local tcbs = signals[i]
+			local pos = tcbs.signal
+			local _, assigned_by = advtrains.distant.get_main(pos)
+			if (not nodst) and (not assigned_by or assigned_by == "routesetting") then
+				advtrains.distant.assign(lastsig, pos, "routesetting", true)
+			end
+			advtrains.interlocking.update_signal_aspect(tcbs, i ~= 1)
+		end
+	end
 	
 	return true
 end
@@ -252,6 +278,13 @@ function ilrs.cancel_route_from(sigd)
 		c_tcbs.route_auto = nil
 		c_tcbs.route_origin = nil
 		
+		if c_tcbs.signal then
+			local pos = c_tcbs.signal
+			local _, assigned_by = advtrains.distant.get_main(pos)
+			if assigned_by == "routesetting" then
+				advtrains.distant.unassign_dst(pos, true)
+			end
+		end
 		advtrains.interlocking.update_signal_aspect(c_tcbs)
 		
 		c_ts_id = c_tcbs.ts_id
@@ -331,7 +364,8 @@ function ilrs.update_route(sigd, tcbs, newrte, cancel)
 			end
 		else
 			--atdebug("Committed Route:",tcbs.routeset)
-			has_changed_aspect = true
+			-- set_route now sets the signal aspects
+			--has_changed_aspect = true
 		end
 	end
 	if has_changed_aspect then
diff --git a/advtrains_interlocking/signal_api.lua b/advtrains_interlocking/signal_api.lua
index 83fae4a..d27a045 100644
--- a/advtrains_interlocking/signal_api.lua
+++ b/advtrains_interlocking/signal_api.lua
@@ -1,247 +1,387 @@
 -- Signal API implementation
 
+local F = advtrains.formspec
 
---[[
-Signal aspect table:
-Note: All speeds are measured in m/s, aka the number of + signs in the HUD.
-asp = {
-	main = <int speed>,
-		-- Main signal aspect, tells state and permitted speed of next section
-		-- 0 = section is blocked
-		-- >0 = section is free, speed limit is this value
-		-- -1 = section is free, maximum speed permitted
-		-- false/nil = Signal doesn't provide main signal information, retain current speed limit.
-	shunt = <boolean>,
-		-- Whether train may proceed as shunt move, on sight
-		-- main aspect takes precedence over this
-		-- When main==0, train switches to shunt move and is restricted to speed 6
-	proceed_as_main = <boolean>,
-		-- If an approaching train is a shunt move and 'shunt' is false,
-		-- the train may proceed as a train move under the "main" aspect
-		-- if the main aspect permits it (i.e. main!=0)
-		-- If this is not set, shunt moves are NOT allowed to switch to
-		-- a train move, and must stop even if "main" would permit passing.
-		-- This is intended to be used for "Halt for shunt moves" signs.
-	
-	dst = <int speed>,
-		-- Distant signal aspect, tells state and permitted speed of the section after next section
-		-- The character of these information is purely informational
-		-- At this time, this field is not actively used
-		-- 0 = section is blocked
-		-- >0 = section is free, speed limit is this value
-		-- -1 = section is free, maximum speed permitted
-		-- false/nil = Signal doesn't provide distant signal information.
-	
-	-- the character of call_on and dead_end is purely informative
-	call_on = <boolean>, -- Call-on route, expect train in track ahead (not implemented yet)
-	dead_end = <boolean>, -- Route ends on a dead end (e.g. bumper) (not implemented yet)
-
-	w_speed = <integer>,
-	-- "Warning speed restriction". Supposed for short-term speed
-	-- restrictions which always override any other restrictions
-	-- imposed by "speed" fields, until lifted by a value of -1
-	-- (Example: german Langsamfahrstellen-Signale)
-	}
-}
+local signal = {}
 
-== How signals actually work in here ==
-Each signal (in the advtrains universe) is some node that has at least the
-following things:
-- An "influence point" that is set somewhere on a rail
-- An aspect which trains that pass the "influence point" have to obey
-
-There can be static and dynamic signals. Static signals are, roughly
-spoken, signs, while dynamic signals are "real" signals which can display
-different things.
-
-The node definition of a signal node should contain those fields:
-groups = {
-  	advtrains_signal = 2,
-	save_in_at_nodedb = 1,
+signal.MASP_HALT = {
+	name = "halt",
+	description = "HALT",
+	halt = true,
 }
-advtrains = {
-	set_aspect = function(pos, node, asp)
-		-- This function gets called whenever the signal should display
-		-- a new or changed signal aspect. It is not required that
-		-- the signal actually displays the exact same aspect, since
-		-- some signals can not do this by design. However, it must
-		-- display an aspect that is at least as restrictive as the passed
-		-- aspect as far as it is capable of doing so.
-		-- Examples:
-		-- - pure shunt signals can not display a "main" aspect
-		--   and have no effect on train moves, so they will only ever
-		--   honor the shunt.free field for their aspect.
-		-- - the german Hl system can only signal speeds of 40, 60
-		--   and 100 km/h, a speed of 80km/h should then be signalled
-		--   as 60 km/h instead.
-		-- In turn, it is not guaranteed that the aspect will fulfill the
-		-- criteria put down in supported_aspects.
-		-- If set_aspect is present, supported_aspects should also be declared.
-		
-		-- The aspect passed in here can always be queried using the
-		-- advtrains.interlocking.signal_get_supposed_aspect(pos) function.
-		-- It is always DANGER when the signal is not used as route signal.
-		
-		-- For static signals, this function should be completely omitted
-		-- If this function is omitted, it won't be possible to use
-		-- route setting on this signal.
-	end,
-	supported_aspects = {
-		-- A table which tells which different types of aspects this signal
-		--  is able to display. It is used to construct the "aspect editing"
-		--  formspec for route programming (and others) It should always be
-		--  present alongside with set_aspect. If this is not specified but
-		--  set_aspect is, the user will be allowed to select any aspect.
-		-- Any of the fields marked with <boolean/nil> support 3 types of values:
-				nil: if this signal can switch between free/blocked
-				false: always shows "blocked", unchangable
-				true: always shows "free", unchangable
-		-- Any of the "speed" fields should contain a list of possible values
-		--  to be set as restriction. If omitted, the value of the described
-		--  field is always assumed to be false (no information)
-		-- A speed of 0 means that the signal can show a "blocked" aspect
-		--  (which is probably the case for most signals)
-		-- If the signal can signal "no information" on one of the fields
-		--  (thus false is an acceptable value), include false in the list
-		-- If your signal can only display a single speed (may it be -1),
-		--  always enclose that single value into a list. (such as {-1})
-		main = {<speed1>, ..., <speedn>} or nil,
-		dst = {<speed1>, ..., <speedn>} or nil,
-		shunt = <boolean/nil>,
-		
-		call_on = <boolean/nil>,
-		dead_end = <boolean/nil>,
-		w_speed = {<speed1>, ..., <speedn>} or nil,
-		
-	},
-	Example for supported_aspects:
-	supported_aspects = {
-		main = {0, 6, -1}, -- can show either "Section blocked", "Proceed at speed 6" or "Proceed at maximum speed"
-		dst = {0, false}, -- can show only if next signal shows "blocked", no other information.
-		shunt = false, -- shunting by this signal is never allowed.
-		
-		call_on = false,
-		dead_end = false,
-		w_speed = nil,
-		-- none of the information can be shown by the signal
-		
-	},
-	
-	get_aspect = function(pos, node)
-		-- This function gets called by the train safety system. It
-		should return the aspect that this signal actually displays,
-		not preferably the input of set_aspect.
-		-- For regular, full-featured light signals, they will probably
-		honor all entries in the original aspect, however, e.g.
-		simple shunt signals always return main=false regardless of
-		the set_aspect input because they can not signal "Halt" to
-		train moves.
-		-- advtrains.interlocking.DANGER contains a default "all-danger" aspect.
-		-- If your signal does not cover certain sub-tables of the aspect,
-		the following reasonable defaults are automatically assumed:
-		main = false (unchanged)
-		dst = false (unchanged)
-		shunt = false (shunting not allowed)
-		info = {} (no further information)
-	end,
-}
-on_rightclick = advtrains.interlocking.signal_rc_handler
-can_dig =  advtrains.interlocking.signal_can_dig
-after_dig_node = advtrains.interlocking.signal_after_dig
-
-(If you need to specify custom can_dig or after_dig_node callbacks,
-please call those functions anyway!)
-
-Important note: If your signal should support external ways to set its
-aspect (e.g. via mesecons), there are some things that need to be considered:
-- advtrains.interlocking.signal_get_supposed_aspect(pos) won't respect this
-- Whenever you change the signal aspect, and that aspect change
-did not happen through a call to
-advtrains.interlocking.signal_set_aspect(pos, asp), you are
-*required* to call this function:
-advtrains.interlocking.signal_on_aspect_changed(pos)
-in order to notify trains about the aspect change.
-This function will query get_aspect to retrieve the new aspect.
-
-]]--
-
-local DANGER = {
+
+signal.ASPI_HALT = {
 	main = 0,
-	dst = false,
 	shunt = false,
 }
-advtrains.interlocking.DANGER = DANGER
 
-advtrains.interlocking.GENERIC_FREE = {
+signal.ASPI_FREE = {
 	main = -1,
 	shunt = false,
-	dst = false,
+	proceed_as_main = true,
 }
 
-local function convert_aspect_if_necessary(asp)
-	if type(asp.main) == "table" then
-		local newasp = {} 
-		if asp.main.free then
-			newasp.main = asp.main.speed
-		else
-			newasp.main = 0
-		end
-		if asp.dst and asp.dst.free then
-			newasp.dst = asp.dst.speed
-		else
-			newasp.dst = 0
+--[[
+Implementation plan orwell 2024-01-28:
+Most parts of ywang's implementation are fine, especially I like the formspecs. But I would like to change a few aspects (no pun intended) of this.
+- Signal gets distant assigned via field in signal aspect table (instead of explicitly)
+- Signal speed/shunt are no longer free-text but rather they need to be predefined in the node definition
+To do this: Differentiation between:
+== Main Aspect ==
+This is what a signal is assigned by either the route system or the user.
+It is a string key which has an appropriate entry in the node definition (where it has a description assigned)
+The signal mod defines a function to set a signal to the most appropriate aspect. This function gets
+a) the main aspect table (straight from node def)
+b) the distant signal's aspect group name & aspect table
+
+== Aspect ==
+One concrete combination of lights/shapes that a signal signal shows. Handling these is at the discretion of
+the signal mod defining the signal, and they are typically combinations of main aspect and distant aspect
+Example:
+- A Ks signal has the aspect_group="proceed_12" set for a route
+- The signal at the end of the route shows aspect_group="proceed_8", advtrains also passes on that this means {main=8, shunt=false}
+- The ndef.advtrains.apply_aspect(pos, asp_group, dst_aspgrp, dst_aspinfo) determines that the signal should now show
+		blinking green with main indicator 12 and dst indicator 8, and sets the nodes accordingly.
+		This function can now return the Aspect Info table, which will be cached by advtrains until the aspect changes again
+		and will be used when a train approaches the signal. If nil is returned, then the aspect will be queried next time
+		by calling ndef.advtrains.get_aspect_info(pos)
+
+Note that once apply_aspect returns, there is no need for advtrains anymore to query the aspect info.
+When the signal, for any reason, wants to change its aspect by itself *without* going through the signal API then
+it should update the aspect info cache by calling advtrains.interlocking.signal.update_aspect_info(pos)
+
+Note that the apply_aspect function MUST accept the following main aspect, even if it is not defined in the main_aspects table:
+{ name = "halt", halt = true }
+It should cause the signal to show its most restrictive aspect. Typically it is a halt aspect, but e.g. for distant-only
+signals this would be "expect stop".
+
+== Aspect Info ==
+The actual signal aspect in the already-known format. This is what the trains use to determine halt/proceed and speed.
+asp = {
+	main = 0 (halt) / -1 (max speed) / false (no info) / <number> (speed limit)
+	shunt = true (shunt free) / false (shunt not free)
+	proceed_as_main = true (shunt move can proceed and become train move when main!=0) / false (no)
+	dst = speed of the remote signal (like main, informative character, not actually used)
+}
+
+Node definition of signals:
+- The signal needs some logic to figure out, for each combination of its own aspect group and the distant signal's aspect, what aspect info it can/will show.
+ndef.advtrains = {
+	main_aspects = {
+		{ name = "proceed" description = "Proceed at full speed", <more data at discretion of signal>}
+		{ name = "reduced" description = "Proceed at reduced speed", <more data at discretion of signal>}
+	}
+		-- This list is mainly for the selection dialog. Order of entries determines list order in the dropdown.
+		-- Some fields have special meaning:
+		-- name: A unique key to identify the main aspect. Only this key is saved, but APIs always receive the whole table
+		-- description: Text shown in UI dropdown
+		-- speed: a number. When present, a speed field is shown in the UI next to the dropdown (prefilled with the value).
+		--		When user selects a different speed there, this different speed replaces the value in the table whenever the main_aspect is applied.
+		-- Node can set any other fields at its discretion. They are not touched.
+		-- Note: On first call advtrains automatically inserts into the ndef.advtrains table a main_aspects_lookup hashtable
+		-- Note: Pure distant signals (that cannot show halt) should NOT have a main_aspects table
+	apply_aspect = function(pos, node, main_aspect, rem_aspect, rem_aspinfo)
+		-- set the node to show the desired aspect
+		-- called by advtrains when this signal's aspect group or the remote signal's aspect changes
+		-- MAY return the aspect_info. If it returns nil then get_aspect_info will be queried at a later point.
+	get_aspect_info(pos, main_aspect)
+		-- Returns the aspect info table (main, shunt, dst etc.)
+	distant_support = true or false
+		-- If true, signal is considered in distant signalling. If false or nil, rem_aspect and rem_aspinfo are never set.
+	route_role = one of "main", "shunt", "distant", "distant_repeater", "end"
+		-- Determines how the signal behaves when routes are set. Only in effect when signal is assigned to a TCB.
+		-- main: The signal is a possible endpoint for a train move route. Distant signals before it refer to it.
+		-- shunt: The signal is a possible endpoint for a shunt move route. Ignored for distant signals.
+		-- distant, distant_repeater: When route is set, signal is always assigned its first main aspect. The next signal with role="main" is set as the remote signal. (currently no further distinction)
+		-- end: like main, but signifies that it marks an end of track and trains cannot continue further. (currently no practical implications above main)
+}
+
+== Nomenclature ==
+The distant/main relation is named as follows:
+     V    M
+=====>====>
+Main signal (main) always refers to the signal that is in focus right now (even if that is a distant-only signal)
+From the standpoint of M, V is the distant (dst) signal. M does not need to concern itself with V's aspect but needs to notify V when it changes
+From the standpoint of V, M is the remote (rem) signal. V needs to show an aspect that matches its remote signal M
+
+== Criteria for which signals are eligible for routes ==
+
+All signals must define:
+- get_aspect_info()
+
+Signals that can be assigned to a TCB must satisfy:
+- apply_aspect() defined
+
+Signals that are possible start and end points for a route must satisfy:
+- main_aspects defined (note, pure distant signals should therefore not define main_aspects)
+
+]]
+
+-- Database
+-- Signal Aspect store
+-- Stores for each signal the main aspect and other info, like the assigned remote signal
+-- [signal encodePos] = { name = "proceed", [speed = 12], [remote = encodedPos] }
+signal.aspects = {}
+
+-- Distant signal notification. Records for each signal the distant signals that refer to it
+-- Note: this mapping is weak. Needs always backreference check.
+-- [signal encodePos] = { [distant signal encodePos] = true }
+signal.distant_refs = {}
+
+function signal.load(data)
+	signal.aspects = data.aspects or {}
+	-- rebuild distant_refs after load
+	signal.distant_refs = {}
+	for main, aspt in pairs(signal.aspects) do
+		if aspt.remote then
+			if not signal.distant_refs[aspt.remote] then
+				signal.distant_refs[aspt.remote] = {}
+			end
+			signal.distant_refs[aspt.remote][main] = true
 		end
-		newasp.proceed_as_main = asp.shunt.proceed_as_main
-		newasp.shunt = asp.shunt.free
-		-- Note: info table not transferred, it's not used right now
-		return newasp
 	end
-	return asp
 end
 
-function advtrains.interlocking.update_signal_aspect(tcbs)
-	if tcbs.signal then
-		local asp = tcbs.aspect or DANGER
-		advtrains.interlocking.signal_set_aspect(tcbs.signal, asp)
-	end
+function signal.save(data)
+	data.aspects = signal.aspects
 end
 
-function advtrains.interlocking.signal_can_dig(pos)
-	return not advtrains.interlocking.db.get_sigd_for_signal(pos)
+
+-- Set a signal's aspect.
+-- Signal aspects should only be set through this function. It takes care of:
+-- - Storing the main aspect and dst pos for this signal permanently (until next change)
+-- - Assigning the distant signal for this signal
+-- - Calling apply_aspect() in the signal's node definition to make the signal show the aspect
+-- - Calling apply_aspect() again whenever the distant signal changes its aspect
+-- - Notifying this signal's distant signals about changes to this signal (unless skip_dst_notify is specified)
+function signal.set_aspect(pos, main_asp_name, main_asp_speed, rem_pos, skip_dst_notify)
+	local main_pts = advtrains.encode_pos(pos)
+	local old_tbl = signal.aspects[main_pts]
+	local old_remote = old_tbl and old_tbl.remote
+	local new_remote = rem_pos and advtrains.encode_pos(rem_pos)
+	
+	-- if remote has changed, unregister from old remote
+	if old_remote and old_remote~=new_remote and signal.distant_refs[old_remote] then
+		atdebug("unregister old remote: ",old_remote,"from",main_pts)
+		signal.distant_refs[old_remote][main_pts] = nil
+	end
+		
+	signal.aspects[main_pts] = { name = main_asp_name, speed = main_asp_speed, remote = new_remote }
+	-- apply aspect on main signal, this also checks new_remote
+	signal.reapply_aspect(main_pts)	
+	
+	-- notify my distants about this change (with limit 2)
+	if not skip_dst_notify then
+		signal.notify_distants_of(main_pts, 2)
+	end
 end
 
-function advtrains.interlocking.signal_after_dig(pos)
-	-- clear influence point
-	advtrains.interlocking.db.clear_ip_by_signalpos(pos)
+function signal.clear_aspect(pos, skip_dst_notify)
+	local main_pts = advtrains.encode_pos(pos)
+	local old_tbl = signal.aspects[main_pts]
+	local old_remote = old_tbl and old_tbl.remote
+	
+	-- unregister from old remote
+	if old_remote then
+		signal.distant_refs[old_remote][main_pts] = nil
+	end
+		
+	signal.aspects[main_pts] = nil
+	-- apply aspect on main signal, this also checks new_remote
+	signal.reapply_aspect(main_pts)	
+	
+	-- notify my distants about this change (with limit 2)
+	if not skip_dst_notify then
+		signal.notify_distants_of(main_pts, 2)
+	end
 end
 
-function advtrains.interlocking.signal_set_aspect(pos, asp)
-	asp = convert_aspect_if_necessary(asp)
-	local node=advtrains.ndb.get_node(pos)
-	local ndef=minetest.registered_nodes[node.name]
-	if ndef and ndef.advtrains and ndef.advtrains.set_aspect then
-		ndef.advtrains.set_aspect(pos, node, asp)
-		advtrains.interlocking.signal_on_aspect_changed(pos)
+-- Notify distant signals of main_pts of a change in the aspect of this signal
+-- 
+function signal.notify_distants_of(main_pts, limit)
+	atdebug("notify_distants_of",advtrains.decode_pos(main_pts),"limit",limit)
+	if limit <= 0 then
+		return
+	end
+	local dstrefs = signal.distant_refs[main_pts]
+	atdebug("dstrefs",dstrefs,"")
+	if dstrefs then
+		for dst,_ in pairs(dstrefs) do
+			-- ensure that the backref is still valid
+			local dst_asp = signal.aspects[dst]
+			if dst_asp and dst_asp.remote == main_pts then
+				signal.reapply_aspect(dst)
+				signal.notify_distants_of(dst, limit - 1)
+			else
+				atwarn("Distant signal backref is not purged: main =",main_pts,", distant =",dst,", remote =",dst_asp.remote,"")
+			end
+		end
 	end
 end
 
--- should be called when aspect has changed on this signal.
-function advtrains.interlocking.signal_on_aspect_changed(pos)
+function signal.notify_trains(pos)
 	local ipts, iconn = advtrains.interlocking.db.get_ip_by_signalpos(pos)
 	if not ipts then return end
 	local ipos = minetest.string_to_pos(ipts)
-	
-	advtrains.invalidate_all_paths_ahead(ipos)
+
+	-- FIXME: invalidate_all_paths_ahead does not appear to always work as expected
+	--advtrains.invalidate_all_paths_ahead(ipos)
+	minetest.after(0, advtrains.invalidate_all_paths, ipos)
+end
+
+-- Update waiting trains and distant signals about a changed signal aspect
+-- Must be called when a signal's aspect changes through some other means
+-- and not via the signal mechanism
+function signal.notify_on_aspect_changed(pos, skip_dst_notify)
+	signal.notify_trains(pos)
+	if not skip_dst_notify then
+		signal.notify_distants_of(advtrains.encode_pos(pos), 2)
+	end
+end
+
+-- Gets the stored main aspect and distant signal position for this signal
+-- This information equals the information last passed to set_aspect
+-- It does not take into consideration the actual speed signalling, please use
+-- get_aspect_info() for this
+-- pos: the position of the signal
+-- returns: main_aspect, dst_pos
+function signal.get_aspect(pos)
+	local aspt = signal.aspects[advtrains.encode_pos(pos)]
+	local ma,dp = signal.get_aspect_internal(pos, aspt)
+	return ma, advtrains.decode_pos(dp)
+end
+
+local function cache_mainaspects(ndefat)
+	ndefat.main_aspects_lookup = {
+		-- always define halt aspect
+		halt = signal.MASP_HALT
+	}
+	for _,ma in ipairs(ndefat.main_aspects) do
+		ndefat.main_aspects_lookup[ma.name] = ma
+	end
+end
+
+function signal.get_aspect_internal(pos, aspt)
+	if not aspt then
+		-- oh, no main aspect, nevermind
+		return nil, aspt.remote, nil
+	end
+	atdebug("get_aspect_internal",pos,aspt)
+	-- look aspect in nodedef
+	local node = advtrains.ndb.get_node_or_nil(pos)
+	local ndef = node and minetest.registered_nodes[node.name]
+	local ndefat = ndef and ndef.advtrains
+	-- only if signal defines main aspect and its set in aspt
+	if ndefat and ndefat.main_aspects and aspt.name then
+		if not ndefat.main_aspects_lookup then
+			cache_mainaspects(ndefat)
+		end
+		local masp = ndefat.main_aspects_lookup[aspt.name]
+		if not masp then
+			atwarn(pos,"invalid main aspect",aspt.name,"valid are",ndefat.main_aspects_lookup)
+			return nil, aspt.remote, node, ndef
+		end
+		-- if speed, then apply speed
+		if masp.speed and aspt.speed then
+			masp = table.copy(masp)
+			masp.speed = aspt.speed
+		end
+		return masp, aspt.remote, node, ndef
+	end
+	-- invalid node or no main aspect, return nil for masp
+	return nil, aspt.remote, node, ndef
+end
+
+-- For the signal at pos, get the "aspect info" table. This contains the speed signalling information at this location
+function signal.get_aspect_info(pos)
+	-- get aspect internal
+	local aspt = signal.aspects[advtrains.encode_pos(pos)]
+	local masp, remote, node, ndef = signal.get_aspect_internal(pos, aspt)
+	-- call into ndef
+	if ndef.advtrains and ndef.advtrains.get_aspect_info then
+		return ndef.advtrains.get_aspect_info(pos, masp)
+	end
+end
+
+
+-- Called when either this signal has changed its main aspect
+-- or when this distant signal's currently assigned main signal has changed its aspect
+-- It retrieves the signal's main aspect and aspect info and calls apply_aspect of the node definition
+-- to update the signal's appearance and aspect info
+-- pts: The signal position to update as encoded_pos
+-- returns: the return value of the nodedef call which may be aspect_info
+function signal.reapply_aspect(pts)
+	-- get aspt
+	local aspt = signal.aspects[pts]
+	atdebug("reapply_aspect",advtrains.decode_pos(pts),"aspt",aspt)
+	if not aspt then
+		return -- oop, nothing to do
+	end
+	-- resolve mainaspect table by name
+	local pos = advtrains.decode_pos(pts)
+	-- note: masp may be nil, when aspt.name was nil. Valid case for distant-only signals
+	local masp, remote, node, ndef = signal.get_aspect_internal(pos, aspt)
+	-- if we have remote, resolve remote
+	local rem_masp, rem_aspi
+	if remote then
+		-- register in remote signal as distant
+		if not signal.distant_refs[remote] then
+			signal.distant_refs[remote] = {}
+		end
+		signal.distant_refs[remote][pts] = true
+		local rem_aspt = signal.aspects[remote]
+		atdebug("resolving remote",advtrains.decode_pos(remote),"aspt",rem_aspt)
+		if rem_aspt and rem_aspt.name then
+			local rem_pos = advtrains.decode_pos(remote)
+			rem_masp, _, _, rem_ndef = signal.get_aspect_internal(rem_pos, rem_aspt)
+			if rem_masp then
+				if rem_ndef.advtrains and rem_ndef.advtrains.get_aspect_info then
+					rem_aspi = rem_ndef.advtrains.get_aspect_info(rem_pos, rem_masp)
+				end
+			end
+		end
+	end
+	-- call into ndef
+	atdebug("applying to",pos,": main_asp",masp,"rem_masp",rem_masp,"rem_aspi",rem_aspi)
+	if ndef.advtrains and ndef.advtrains.apply_aspect then
+		ndef.advtrains.apply_aspect(pos, node, masp, rem_masp, rem_aspi)
+	end
+	-- notify trains
+	signal.notify_trains(pos)
+end
+
+-- Update this signal's aspect based on the set route
+-- 
+function signal.update_route_aspect(tcbs, skip_dst_notify)
+	if tcbs.signal then
+		local asp = tcbs.aspect or signal.MASP_HALT
+		signal.set_aspect(tcbs.signal, asp, skip_dst_notify)
+	end
+end
+
+
+----------------
+
+function signal.can_dig(pos)
+	return not advtrains.interlocking.db.get_sigd_for_signal(pos)
 end
 
-function advtrains.interlocking.signal_rc_handler(pos, node, player, itemstack, pointed_thing)
+function advtrains.interlocking.signal_after_dig(pos)
+	-- TODO clear influence point
+	advtrains.interlocking.signal.clear_aspect(pos)
+end
+
+function signal.on_rightclick(pos, node, player, itemstack, pointed_thing)
 	local pname = player:get_player_name()
 	local control = player:get_player_control()
 	if control.aux1 then
 		advtrains.interlocking.show_ip_form(pos, pname)
 		return
 	end
-	
+	advtrains.interlocking.show_signal_form(pos, node, pname)
+end
+
+function advtrains.interlocking.show_signal_form(pos, node, pname)
 	local sigd = advtrains.interlocking.db.get_sigd_for_signal(pos)
 	if sigd then
 		advtrains.interlocking.show_signalling_form(sigd, pname)
@@ -250,14 +390,14 @@ function advtrains.interlocking.signal_rc_handler(pos, node, player, itemstack,
 		if ndef.advtrains and ndef.advtrains.set_aspect then
 			-- permit to set aspect manually
 			local function callback(pname, aspect)
-				advtrains.interlocking.signal_set_aspect(pos, aspect)
+				signal.set_aspect(pos, aspect)
 			end
-			local isasp = ndef.advtrains.get_aspect(pos, node)
-			
+			local isasp = advtrains.interlocking.signal_get_aspect(pos, node)
+
 			advtrains.interlocking.show_signal_aspect_selector(
 				pname,
 				ndef.advtrains.supported_aspects,
-				"Set aspect manually", callback,
+				pos, callback,
 				isasp)
 		else
 			--static signal - only IP
@@ -266,50 +406,13 @@ function advtrains.interlocking.signal_rc_handler(pos, node, player, itemstack,
 	end
 end
 
--- Returns the aspect the signal at pos is supposed to show
-function advtrains.interlocking.signal_get_supposed_aspect(pos)
-	local sigd = advtrains.interlocking.db.get_sigd_for_signal(pos)
-	if sigd then
-		local tcbs = advtrains.interlocking.db.get_tcbs(sigd)
-		if tcbs.aspect then
-			return convert_aspect_if_necessary(tcbs.aspect)
-		end
-	end
-	return DANGER;
-end
-
--- Returns the actual aspect of the signal at position, as returned by the nodedef.
--- returns nil when there's no signal at the position
-function advtrains.interlocking.signal_get_aspect(pos)
-	local node=advtrains.ndb.get_node(pos)
-	local ndef=minetest.registered_nodes[node.name]
-	if ndef and ndef.advtrains and ndef.advtrains.get_aspect then
-		local asp = ndef.advtrains.get_aspect(pos, node)
-		if not asp then asp = DANGER end
-		return convert_aspect_if_necessary(asp)
-	end
-	return nil
-end
-
--- Returns the "supported_aspects" of the signal at position, as returned by the nodedef.
--- returns nil when there's no signal at the position
-function advtrains.interlocking.signal_get_supported_aspects(pos)
-	local node=advtrains.ndb.get_node(pos)
-	local ndef=minetest.registered_nodes[node.name]
-	if ndef and ndef.advtrains and ndef.advtrains.supported_aspects then
-		local asp = ndef.advtrains.supported_aspects
-		return asp
-	end
-	return nil
-end
-
 local players_assign_ip = {}
 
 local function ipmarker(ipos, connid)
 	local node_ok, conns, rhe = advtrains.get_rail_info_at(ipos, advtrains.all_tracktypes)
 	if not node_ok then return end
 	local yaw = advtrains.dir_to_angle(conns[connid].c)
-	
+
 	-- using tcbmarker here
 	local obj = minetest.add_entity(vector.add(ipos, {x=0, y=0.2, z=0}), "advtrains_interlocking:tcbmarker")
 	if not obj then return end
@@ -319,54 +422,77 @@ local function ipmarker(ipos, connid)
 	})
 end
 
--- shows small info form for signal IP state/assignment
+function advtrains.interlocking.make_ip_formspec_component(pos, x, y, w)
+	advtrains.interlocking.db.check_for_duplicate_ip(pos)
+	local pts, connid = advtrains.interlocking.db.get_ip_by_signalpos(pos)
+	if pts then
+		return table.concat {
+			F.S_label(x, y, "Influence point is set at @1.", string.format("%s/%s", pts, connid)),
+			F.S_button_exit(x, y+0.5, w/2-0.125, "ip_set", "Modify"),
+			F.S_button_exit(x+w/2+0.125, y+0.5, w/2-0.125, "ip_clear", "Clear"),
+		}, pts, connid
+	else
+		return table.concat {
+			F.S_label(x, y, "Influence point is not set."),
+			F.S_button_exit(x, y+0.5, w, "ip_set", "Set influence point"),
+		}
+	end
+end
+
+-- shows small info form for signal properties
+-- This function is named show_ip_form because it was originally only intended
+-- for assigning/changing the influence point.
 -- only_notset: show only if it is not set yet (used by signal tcb assignment)
 function advtrains.interlocking.show_ip_form(pos, pname, only_notset)
 	if not minetest.check_player_privs(pname, "interlocking") then
 		return
 	end
-	local form = "size[7,5]label[0.5,0.5;Signal at "..minetest.pos_to_string(pos).."]"
-	advtrains.interlocking.db.check_for_duplicate_ip(pos)
-	local pts, connid = advtrains.interlocking.db.get_ip_by_signalpos(pos)
+	local ipform, pts, connid = advtrains.interlocking.make_ip_formspec_component(pos, 0.5, 0.5, 7)
+	local form = {
+		"formspec_version[4]",
+		"size[8,2.25]",
+		ipform,
+	}
 	if pts then
-		form = form.."label[0.5,1.5;Influence point is set at "..pts.."/"..connid.."]"
-		form = form.."button_exit[0.5,2.5;  5,1;set;Move]"
-		form = form.."button_exit[0.5,3.5;  5,1;clear;Clear]"
 		local ipos = minetest.string_to_pos(pts)
 		ipmarker(ipos, connid)
-	else
-		form = form.."label[0.5,1.5;Influence point is not set.]"
-		form = form.."label[0.5,2.0;It is recommended to set an influence point.]"
-		form = form.."label[0.5,2.5;This is the point where trains will obey the signal.]"
-		
-		form = form.."button_exit[0.5,3.5;  5,1;set;Set]"
 	end
+	if advtrains.distant.appropriate_signal(pos) then
+		form[#form+1] = advtrains.interlocking.make_dst_formspec_component(pos, 0.5, 2, 7, 4.25)
+		form[2] = "size[8,6.75]"
+	end
+	form = table.concat(form)
 	if not only_notset or not pts then
-		minetest.show_formspec(pname, "at_il_ipassign_"..minetest.pos_to_string(pos), form)
+		minetest.show_formspec(pname, "at_il_propassign_"..minetest.pos_to_string(pos), form)
 	end
 end
 
-minetest.register_on_player_receive_fields(function(player, formname, fields)
-	local pname = player:get_player_name()
-	if not minetest.check_player_privs(pname, {train_operator=true, interlocking=true}) then
+function advtrains.interlocking.handle_ip_formspec_fields(pname, pos, fields)
+	if not (pos and minetest.check_player_privs(pname, {train_operator=true, interlocking=true})) then
 		return
 	end
-	local pts = string.match(formname, "^at_il_ipassign_([^_]+)$")
+	if fields.ip_set then
+		advtrains.interlocking.signal_init_ip_assign(pos, pname)
+	elseif fields.ip_clear then
+		advtrains.interlocking.db.clear_ip_by_signalpos(pos)
+	end
+end
+
+minetest.register_on_player_receive_fields(function(player, formname, fields)
+	local pname = player:get_player_name()
+	local pts = string.match(formname, "^at_il_propassign_([^_]+)$")
 	local pos
 	if pts then
 		pos = minetest.string_to_pos(pts)
 	end
 	if pos then
-		if fields.set then
-			advtrains.interlocking.signal_init_ip_assign(pos, pname)
-		elseif fields.clear then
-			advtrains.interlocking.db.clear_ip_by_signalpos(pos)
-		end
+		advtrains.interlocking.handle_ip_formspec_fields(pname, pos, fields)
+		advtrains.interlocking.handle_dst_formspec_fields(pname, pos, fields)
 	end
 end)
 
 -- inits the signal IP assignment process
-function advtrains.interlocking.signal_init_ip_assign(pos, pname)
+function signal.init_ip_assign(pos, pname)
 	if not minetest.check_player_privs(pname, "interlocking") then
 		minetest.chat_send_player(pname, "Insufficient privileges to use this!")
 		return
@@ -413,127 +539,4 @@ minetest.register_on_punchnode(function(pos, node, player, pointed_thing)
 end)
 
 
---== aspect selector ==--
-
-local players_aspsel = {}
-
---[[
-suppasp: "supported_aspects" table
-purpose: form title string
-callback: func(pname, aspect) called on form submit
-isasp: aspect currently set
-]]
-function advtrains.interlocking.show_signal_aspect_selector(pname, p_suppasp, p_purpose, callback, isasp)
-	local suppasp = p_suppasp or {
-		main = {0, -1}, dst = {false}, shunt = false, info = {},
-	}
-	local purpose = p_purpose or ""
-	
-	local form = "size[7,7]label[0.5,0.5;Select Signal Aspect:]"
-	form = form.."label[0.5,1;"..purpose.."]"
-	
-	form = form.."label[0.5,1.5;== Main Signal ==]"
-	local selid = 1
-	local entries = {}
-	for idx, spv in ipairs(suppasp.main) do
-		local entry
-		if spv == 0 then
-			entry = "Halt"
-		elseif spv == -1 then
-			entry = "Continue at maximum speed"
-		elseif not spv then
-			entry = "Continue\\, speed limit unchanged (no info)"
-		else
-			entry = "Continue at speed of "..spv				
-		end
-		-- hack: the crappy formspec system returns the label, not the index. save the index in it.
-		entries[idx] = idx.."| "..entry
-		if isasp and spv == (isasp.main or false) then
-			selid = idx
-		end
-	end
-	form = form.."dropdown[0.5,2;6;main;"..table.concat(entries, ",")..";"..selid.."]"
-
-	
-	form = form.."label[0.5,3;== Shunting ==]"
-	if suppasp.shunt == nil then
-		local st = 1
-		if isasp and isasp.shunt then st=2 end
-		form = form.."dropdown[0.5,3.5;6;shunt_free;---,allowed;"..st.."]"
-	end
-
-	form = form.."label[0.5,4.5;== Distant Signal ==]"
-	local selid = 1
-	local entries = {}
-	for idx, spv in ipairs(suppasp.dst) do
-		local entry
-		if spv == 0 then
-			entry = "Expect to stop at the next signal"
-		elseif spv == -1 then
-			entry = "Expect to pass the next signal at maximum speed"
-		elseif not spv then
-			entry = "No info"
-		else
-			entry = string.format("Expect to pass the next signal at speed of %d", spv)
-		end
-		entries[idx] = idx.."| "..entry
-		if isasp and spv == (isasp.dst or false) then
-			selid = idx
-		end
-	end
-	form = form.."dropdown[0.5,5;6;dst;"..table.concat(entries, ",")..";"..selid.."]"
-
-	form = form.."button_exit[0.5,6;5,1;save;Save signal aspect]"
-	
-	local token = advtrains.random_id()
-	
-	minetest.show_formspec(pname, "at_il_sigaspdia_"..token, form)
-	
-	minetest.after(1, function()
-	players_aspsel[pname] = {
-		suppasp = suppasp,
-		callback = callback,
-		token = token,
-	}
-	end)
-end
-
-local function usebool(sup, val, free)
-	if sup == nil then
-		return val==free
-	else
-		return sup
-	end
-end
-
--- other side of hack: extract the index
-local function ddindex(val)
-	return tonumber(string.match(val, "^(%d+)|"))
-end
-
--- TODO use non-hacky way to parse outputs
-
-minetest.register_on_player_receive_fields(function(player, formname, fields)
-	local pname = player:get_player_name()
-	local psl = players_aspsel[pname]
-	if psl then
-		if formname == "at_il_sigaspdia_"..psl.token then
-			if fields.save then
-				local maini = ddindex(fields.main)
-				if not maini then return end
-				local dsti = ddindex(fields.dst)
-				if not dsti then return end
-				local asp = {
-					main = psl.suppasp.main[maini],
-					dst = psl.suppasp.dst[dsti],
-					shunt = usebool(psl.suppasp.shunt, fields.shunt_free, "allowed"),
-					info = {}
-				}
-				psl.callback(pname, asp)
-			end
-		else
-			players_aspsel[pname] = nil
-		end
-	end
-	
-end)
+advtrains.interlocking.signal = signal
diff --git a/advtrains_interlocking/signal_aspect_accessors.lua b/advtrains_interlocking/signal_aspect_accessors.lua
new file mode 100644
index 0000000..d91df31
--- /dev/null
+++ b/advtrains_interlocking/signal_aspect_accessors.lua
@@ -0,0 +1,163 @@
+--- Signal aspect accessors
+-- @module advtrains.interlocking
+
+local A = advtrains.interlocking.aspect
+local D = advtrains.distant
+local I = advtrains.interlocking
+local N = advtrains.ndb
+local pts = advtrains.roundfloorpts
+
+local get_aspect
+
+local supposed_aspects = {}
+
+--- Replace the signal aspect cache.
+-- @function load_supposed_aspects
+-- @param db The new database.
+function I.load_supposed_aspects(tbl)
+	if tbl then
+		supposed_aspects = {}
+		for k, v in pairs(tbl) do
+			supposed_aspects[k] = A(v)
+		end
+	end
+end
+
+--- Retrieve the signal aspect cache.
+-- @function save_supposed_aspects
+-- @return The current database in use.
+function I.save_supposed_aspects()
+	local t = {}
+	for k, v in pairs(supposed_aspects) do
+		t[k] = v:plain(true)
+	end
+	return t
+end
+
+--- Read the aspect of a signal strictly from cache.
+-- @param pos The position of the signal.
+-- @return[1] The aspect of the signal (if present in cache).
+-- @return[2] The nil constant (otherwise).
+local function get_supposed_aspect(pos)
+	return supposed_aspects[pts(pos)]
+end
+
+--- Update the signal aspect information in cache.
+-- @param pos The position of the signal.
+-- @param asp The new signal aspect
+local function set_supposed_aspect(pos, asp)
+	supposed_aspects[pts(pos)] = asp
+end
+
+--- Get the definition of a node.
+-- @param pos The position of the node.
+-- @return[1] The definition of the node (if present).
+-- @return[2] An empty table (otherwise).
+local function get_ndef(pos)
+	local node = N.get_node(pos)
+	return (minetest.registered_nodes[node.name] or {}), node
+end
+
+--- Get the aspects supported by a signal.
+-- @function signal_get_supported_aspects
+-- @param pos The position of the signal.
+-- @return[1] The table of supported aspects (if present).
+-- @return[2] The nil constant (otherwise).
+local function get_supported_aspects(pos)
+	local ndef = get_ndef(pos)
+	if ndef.advtrains and ndef.advtrains.supported_aspects then
+		return ndef.advtrains.supported_aspects
+	end
+	return nil
+end
+
+--- Adjust a new signal aspect to fit a signal.
+-- @param pos The position of the signal.
+-- @param asp The new signal aspect.
+-- @return The adjusted signal aspect.
+-- @return The information to pass to the `advtrains.set_aspect` field in the node definitions.
+local function adjust_aspect(pos, asp)
+	local asp = A(asp)
+
+	local mainpos = D.get_main(pos)
+	local nxtasp
+	if mainpos then
+		nxtasp = get_aspect(mainpos)
+	end
+	local suppasp = get_supported_aspects(pos)
+	if not suppasp then
+		return asp
+	end
+	return asp:adjust_distant(nxtasp, suppasp.dst_shift):to_group(suppasp.group)
+end
+
+--- Get the aspect of a signal without accessing the cache.
+-- For most cases, `get_aspect` should be used instead.
+-- @function signal_get_real_aspect
+-- @param pos The position of the signal.
+-- @return[1] The signal aspect adjusted using `adjust_aspect` (if present).
+-- @return[2] The nil constant (otherwise).
+local function get_real_aspect(pos)
+	local ndef, node = get_ndef(pos)
+	if ndef.advtrains and ndef.advtrains.get_aspect then
+		local asp = ndef.advtrains.get_aspect(pos, node) or I.DANGER
+		return adjust_aspect(pos, asp)
+	end
+	return nil
+end
+
+--- Get the aspect of a signal.
+-- @function signal_get_aspect
+-- @param pos The position of the signal.
+-- @return[1] The aspect of the signal (if present).
+-- @return[2] The nil constant (otherwise).
+get_aspect = function(pos)
+	local asp = get_supposed_aspect(pos)
+	if not asp then
+		asp = get_real_aspect(pos)
+		set_supposed_aspect(pos, asp)
+	end
+	return asp
+end
+
+--- Set the aspect of a signal.
+-- @function signal_set_aspect
+-- @param pos The position of the signal.
+-- @param asp The new signal aspect.
+-- @param[opt=false] skipdst Whether to skip updating distant signals.
+local function set_aspect(pos, asp, skipdst)
+	local node = N.get_node(pos)
+	local ndef = minetest.registered_nodes[node.name]
+	if ndef and ndef.advtrains and ndef.advtrains.set_aspect then
+		local oldasp = I.signal_get_aspect(pos) or DANGER
+		local newasp = adjust_aspect(pos, asp)
+		set_supposed_aspect(pos, newasp)
+		ndef.advtrains.set_aspect(pos, node, newasp)
+		I.signal_on_aspect_changed(pos)
+		local aspect_changed = oldasp ~= newasp
+		if (not skipdst) and aspect_changed then
+			D.update_main(pos)
+		end
+	end
+end
+
+--- Remove a signal from cache.
+-- @function signal_clear_aspect
+-- @param pos The position of the signal.
+local function clear_aspect(pos)
+	set_supposed_aspect(pos, nil)
+end
+
+--- Readjust the aspect of a signal.
+-- @function signal_readjust_aspect
+-- @param pos The position of the signal.
+local function readjust_aspect(pos)
+	set_aspect(pos, get_aspect(pos))
+end
+
+I.signal_get_supported_aspects = get_supported_aspects
+I.signal_get_real_aspect = get_real_aspect
+I.signal_get_aspect = get_aspect
+I.signal_set_aspect = set_aspect
+I.signal_clear_aspect = clear_aspect
+I.signal_readjust_aspect = readjust_aspect
diff --git a/advtrains_interlocking/signal_aspect_ui.lua b/advtrains_interlocking/signal_aspect_ui.lua
new file mode 100644
index 0000000..a81b7fe
--- /dev/null
+++ b/advtrains_interlocking/signal_aspect_ui.lua
@@ -0,0 +1,262 @@
+local F = advtrains.formspec
+local players_aspsel = {}
+
+local function describe_main_aspect(spv)
+	if spv == 0 then
+		return attrans("Danger (halt)")
+	elseif spv == -1 then
+		return attrans("Continue at maximum speed")
+	elseif not spv then
+		return attrans("Continue with current speed limit")
+	else
+		return attrans("Continue with the speed limit of @1", tostring(spv))
+	end
+end
+
+local function describe_shunt_aspect(shunt)
+	if shunt then
+		return attrans("Shunting allowed")
+	else
+		return attrans("No shunting")
+	end
+end
+
+local function describe_distant_aspect(spv)
+	if spv == 0 then
+		return attrans("Expect to stop at the next signal")
+	elseif spv == -1 then
+		return attrans("Expect to continue at maximum speed")
+	elseif not spv then
+		return attrans("No distant signal information")
+	else
+		return attrans("Expect to continue with a speed limit of @1", tostring(spv))
+	end
+end
+
+advtrains.interlocking.describe_main_aspect = describe_main_aspect
+advtrains.interlocking.describe_shunt_aspect = describe_shunt_aspect
+advtrains.interlocking.describe_distant_aspect = describe_distant_aspect
+
+local function dsel(p, q, x, y)
+	if p == nil then
+		if q then
+			return x
+		else
+			return y
+		end
+	elseif p then
+		return x
+	else
+		return y
+	end
+end
+
+local function describe_supported_aspects(suppasp, isasp)
+	local t = {}
+
+	local entries = {attrans("Use default value")}
+	local selid = 0
+	local mainasps = suppasp.main
+	if type(mainasps) ~= "table" then
+		mainasps = {mainasps}
+	end
+	for idx, spv in ipairs(mainasps) do
+		if isasp and spv == rawget(isasp, "main") then
+			selid = idx
+		end
+		entries[idx+1] = describe_main_aspect(spv)
+	end
+	t.main = entries
+	t.main_current = selid+1
+	t.main_string = tostring(isasp.main)
+	if t.main == nil then
+		t.main_string = ""
+	end
+
+	t.shunt = {
+		attrans("No shunting"),
+		attrans("Shunting allowed"),
+		attrans("Proceed as main"),
+	}
+
+	t.shunt_current = dsel(suppasp.shunt, isasp.shunt, 2, 1)
+	if dsel(suppasp.proceed_as_main, isasp.proceed_as_main, t.shunt_current == 1) then
+		t.shunt_current = 3
+	end
+	t.shunt_const = suppasp.shunt ~= nil
+
+	if suppasp.group then
+		local gdef = advtrains.interlocking.aspect.get_group_definition(suppasp.group)
+		if gdef then
+			t.group = suppasp.group
+			t.groupdef = gdef
+			local entries = {}
+			local selid = 1
+			for idx, name in ipairs(suppasp.name or {}) do
+				entries[idx] = gdef.aspects[name].label
+				if suppasp.group == isasp.group and name == isasp.name then
+					selid = idx
+				end
+			end
+			t.name = entries
+			t.name_current = selid
+		end
+	end
+
+	return t
+end
+
+advtrains.interlocking.describe_supported_aspects = describe_supported_aspects
+
+local function make_signal_aspect_selector(suppasp, purpose, isasp)
+	local t = describe_supported_aspects(suppasp, isasp)
+	local formmode = 1
+
+	local pos
+	if type(purpose) == "table" then
+		formmode = 2
+		pos = purpose.pos
+	end
+
+	local form = {
+		"formspec_version[4]",
+		string.format("size[8,%f]", ({5.75, 10.75})[formmode]),
+		F.S_label(0.5, 0.5, "Select signal aspect"),
+	}
+	local h0 = ({0, 1.5})[formmode]
+	form[#form+1] = F.S_label(0.5, 1.5+h0, "Main aspect")
+	form[#form+1] = F.S_label(0.5, 3+h0, "Shunt aspect")
+	form[#form+1] = F.S_button_exit(0.5, 4.5+h0, 7, "asp_save", "Save signal aspect")
+	if formmode == 1 then
+		form[#form+1] = F.label(0.5, 1, purpose)
+		form[#form+1] = F.field(0.5, 2, 7, "asp_mainval", "", t.main_string)
+	elseif formmode == 2 then
+		if t.group then
+			form[#form+1] = F.S_label(0.5, 1.5, "Signal aspect group: @1", t.groupdef.label)
+			form[#form+1] = F.dropdown(0.5, 2, 7, "asp_namesel", t.name, t.name_current, true)
+		else
+			form[#form+1] = F.S_label(0.5, 1.5, "This signal does not belong to a signal aspect group.")
+			form[#form+1] = F.S_label(0.5, 2, "You can not use a predefined signal aspect.")
+		end
+		form[#form+1] = F.S_label(0.5, 1, "Signal at @1", minetest.pos_to_string(pos))
+		form[#form+1] = F.dropdown(0.5, 3.5, 7, "asp_mainsel", t.main, t.main_current, true)
+		form[#form+1] = advtrains.interlocking.make_ip_formspec_component(pos, 0.5, 7, 7)
+		form[#form+1] = advtrains.interlocking.make_short_dst_formspec_component(pos, 0.5, 8.5, 7)
+	end
+
+	if formmode == 2 and t.shunt_const then
+		form[#form+1] = F.label(0.5, 3.5+h0, t.shunt[t.shunt_current])
+		form[#form+1] = F.S_label(0.5, 4+h0, "The shunt aspect cannot be changed.")
+	else
+		form[#form+1] = F.dropdown(0.5, 3.5+h0, 7, "asp_shunt", t.shunt, t.shunt_current, true)
+	end
+
+	return table.concat(form)
+end
+
+function advtrains.interlocking.show_signal_aspect_selector(pname, p_suppasp, p_purpose, callback, isasp)
+	local suppasp = p_suppasp or {
+		main = {0, -1},
+		dst = {false},
+		shunt = false,
+		info = {},
+	}
+	local purpose = p_purpose or ""
+	local pos
+	if type(p_purpose) == "table" then
+		pos = p_purpose
+		purpose = {pname = pname, pos = pos}
+	end
+
+	local form = make_signal_aspect_selector(suppasp, purpose, isasp)
+	if not form then
+		return
+	end
+
+	local token = advtrains.random_id()
+	minetest.show_formspec(pname, "at_il_sigaspdia_"..token, form)
+	minetest.after(0, function()
+		players_aspsel[pname] = {
+			purpose = purpose,
+			suppasp = suppasp,
+			callback = callback,
+			token = token,
+		}
+	end)
+end
+
+local function usebool(sup, val, free)
+	if sup == nil then
+		return val == free
+	else
+		return sup
+	end
+end
+
+local function get_aspect_from_formspec(suppasp, fields, psl)
+	local namei, group, name = tonumber(fields.asp_namesel), suppasp.group, nil
+	local gdef = advtrains.interlocking.aspect.get_group_definition(group)
+	if gdef then
+		local names = suppasp.name or {}
+		name = names[namei] or names[names]
+	else
+		group = nil
+	end
+	local maini = tonumber(fields.asp_mainsel)
+	local main = (suppasp.main or {})[(maini or 0)-1]
+	if not maini then
+		local mainval = fields.asp_mainval
+		if mainval == "-1" then
+			main = -1
+		elseif mainval == "x" then
+			main = false
+		elseif string.match(mainval, "^%d+$") then
+			main = tonumber(mainval)
+		else
+			main = nil
+		end
+	elseif maini <= 1 then
+		main = nil
+	end
+	local shunti = tonumber(fields.asp_shunt)
+	local shunt = suppasp.shunt
+	if shunt == nil then
+		shunt = shunti == 2
+	end
+	local proceed_as_main = suppasp.proceed_as_main
+	if proceed_as_main == nil then
+		proceed_as_main = shunti == 3
+	end
+	return advtrains.interlocking.aspect {
+		main = main,
+		shunt = shunt,
+		proceed_as_main = proceed_as_main,
+		info = {},
+		name = name,
+		group = group,
+	}
+end
+
+minetest.register_on_player_receive_fields(function(player, formname, fields)
+	local pname = player:get_player_name()
+	local psl = players_aspsel[pname]
+	if psl then
+		if formname == "at_il_sigaspdia_"..psl.token then
+			local suppasp = psl.suppasp
+			if fields.asp_save then
+				local asp
+				asp = get_aspect_from_formspec(suppasp, fields, psl)
+				if asp then
+					psl.callback(pname, asp)
+				end
+			end
+			if type(psl.purpose) == "table" then
+				local pos = psl.purpose.pos
+				advtrains.interlocking.handle_ip_formspec_fields(pname, pos, fields)
+				advtrains.interlocking.handle_dst_formspec_fields(pname, pos, fields)
+			end
+		else
+			players_aspsel[pname] = nil
+		end
+	end
+end)
diff --git a/advtrains_interlocking/spec/basic_signalling_spec.lua b/advtrains_interlocking/spec/basic_signalling_spec.lua
new file mode 100644
index 0000000..a4e1e3a
--- /dev/null
+++ b/advtrains_interlocking/spec/basic_signalling_spec.lua
@@ -0,0 +1,106 @@
+--[[
+This file tests a large part of the signaling system, as a lot of tests for the
+signaling system tend to overlap for various parts of the system.
+]]
+
+require("mineunit")
+mineunit("core")
+
+_G.advtrains = {
+	interlocking = {
+		aspect = fixture("../../aspect"),
+	},
+	ndb = {
+		get_node = minetest.get_node,
+		swap_node = minetest.swap_node,
+	}
+}
+
+fixture("advtrains_helpers")
+fixture("../../database")
+sourcefile("distant")
+sourcefile("signal_api")
+sourcefile("signal_aspect_accessors")
+fixture("../../demosignals")
+
+minetest.register_node("advtrains_interlocking:signal_sign", {
+	advtrains = {
+		get_aspcet = function() return {main = 19} end
+	}
+})
+
+local D = advtrains.distant
+local I = advtrains.interlocking
+local A = I.aspect
+
+local stub_aspect_t1 = {
+	free = {main = -1},
+	slow = {main = 6},
+	danger = {main = 0, shunt = false},
+}
+for k, v in pairs(stub_aspect_t1) do
+	stub_aspect_t1[k] = A(v)
+end
+local stub_pos_t1 = {}
+for i = 1, 4 do
+	stub_pos_t1[i] = {x = 1, y = 0, z = i}
+end
+
+world.layout {
+	{stub_pos_t1[1], "advtrains_interlocking:ds_danger"},
+	{stub_pos_t1[2], "advtrains_interlocking:ds_slow"},
+	{stub_pos_t1[3], "advtrains_interlocking:ds_free"},
+	{stub_pos_t1[4], "advtrains_interlocking:signal_sign"},
+}
+
+describe("API for supposed signal aspects", function()
+	it("should load and save data properly", function()
+		local tbl = {_foo = {}}
+		I.load_supposed_aspects(tbl)
+		assert.same(tbl, I.save_supposed_aspects())
+	end)
+	it("should set and get signals properly", function ()
+		local pos = stub_pos_t1[2]
+		local asp = stub_aspect_t1.slow
+		local newasp = A{ main = math.random(1,5) }
+		assert.equal(asp, I.signal_get_aspect(pos))
+		I.signal_set_aspect(pos, newasp)
+		assert.equal(newasp, I.signal_get_aspect(pos))
+		assert.equal(asp, I.signal_get_real_aspect(pos))
+		I.signal_set_aspect(pos, asp)
+	end)
+end)
+
+describe("Distant signaling", function()
+	it("should assign distant signals and set the distant aspect correspondingly", function()
+		for i = 1, 2 do
+			D.assign(stub_pos_t1[i], stub_pos_t1[i+1])
+		end
+		assert.equal(stub_aspect_t1.danger, I.signal_get_aspect(stub_pos_t1[1]))
+		assert.equal(A{main = 6, dst = 0}, I.signal_get_aspect(stub_pos_t1[2]))
+		assert.equal(A{main = -1, dst = 6}, I.signal_get_aspect(stub_pos_t1[3]))
+	end)
+	it("should report assignments properly", function()
+		assert.same({stub_pos_t1[1], "manual"}, {D.get_main(stub_pos_t1[2])})
+		assert.same({[advtrains.encode_pos(stub_pos_t1[3])] = "manual"}, D.get_dst(stub_pos_t1[2]))
+	end)
+	it("should update distant aspects automatically", function()
+		I.signal_set_aspect(stub_pos_t1[2], {main = 2, dst = -1})
+		assert.equal(A{main = 2, dst = 0}, I.signal_get_aspect(stub_pos_t1[2]))
+		assert.equal(A{main = -1, dst = 2}, I.signal_get_aspect(stub_pos_t1[3]))
+	end)
+	it("should unassign signals when one is removed", function()
+		world.set_node(stub_pos_t1[2], "air")
+		assert.same({}, D.get_dst(stub_pos_t1[1]))
+		assert.same({}, {D.get_main(stub_pos_t1[3])})
+		assert.same(stub_aspect_t1.free, I.signal_get_aspect(stub_pos_t1[3]))
+	end)
+	it("should reject signal signs", function()
+		D.assign(stub_pos_t1[1], stub_pos_t1[4])
+		assert.same({}, D.get_dst(stub_pos_t1[1]))
+		assert.same({}, {D.get_main(stub_pos_t1[4])})
+		D.assign(stub_pos_t1[4], stub_pos_t1[1])
+		assert.same({}, D.get_dst(stub_pos_t1[4]))
+		assert.same({}, {D.get_main(stub_pos_t1[1])})
+	end)
+end)
diff --git a/advtrains_interlocking/spec/fixtures/advtrains_helpers.lua b/advtrains_interlocking/spec/fixtures/advtrains_helpers.lua
new file mode 120000
index 0000000..9b0ab67
--- /dev/null
+++ b/advtrains_interlocking/spec/fixtures/advtrains_helpers.lua
@@ -0,0 +1 @@
+../../../advtrains/helpers.lua
\ No newline at end of file
diff --git a/advtrains_interlocking/spec/mineunit.conf b/advtrains_interlocking/spec/mineunit.conf
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/advtrains_interlocking/spec/mineunit.conf
diff --git a/advtrains_interlocking/spec/signal_group_spec.lua b/advtrains_interlocking/spec/signal_group_spec.lua
new file mode 100644
index 0000000..bc9d007
--- /dev/null
+++ b/advtrains_interlocking/spec/signal_group_spec.lua
@@ -0,0 +1,95 @@
+require "mineunit"
+mineunit("core")
+
+_G.advtrains = {
+	interlocking = {
+		aspect = sourcefile("aspect"),
+	},
+	ndb = {
+		get_node = minetest.get_node,
+		swap_node = minetest.swap_node,
+	}
+}
+
+fixture("advtrains_helpers")
+sourcefile("database")
+sourcefile("signal_api")
+sourcefile("distant")
+sourcefile("signal_aspect_accessors")
+
+local A = advtrains.interlocking.aspect
+local D = advtrains.distant
+local I = advtrains.interlocking
+local N = advtrains.ndb
+
+local groupdef = {
+	name = "foo",
+	aspects = {
+		proceed = {main = -1},
+		caution = {},
+		danger = {main = 0},
+		"proceed",
+		{"caution"},
+		"danger",
+	},
+}
+
+for k, v in pairs(groupdef.aspects) do
+	minetest.register_node("advtrains_interlocking:" .. k, {
+		advtrains = {
+			supported_aspects = {
+				group = "foo",
+			},
+			get_aspect = function() return A{group = "foo", name = k} end,
+			set_aspect = function(pos, _, name)
+				N.swap_node(pos, {name = "advtrains_interlocking:" .. name})
+			end,
+		}
+	})
+end
+
+local origin = vector.new(0, 0, 0)
+local dstpos = vector.new(0, 0, 1)
+
+world.layout {
+	{origin, "advtrains_interlocking:danger"},
+	{dstpos, "advtrains_interlocking:proceed"},
+}
+
+describe("signal group registration", function()
+	it("should work", function()
+		A.register_group(groupdef)
+		assert(A.get_group_definition("foo"))
+	end)
+	it("should only be allowed once for the same group", function()
+		assert.has.errors(function() A.register_group(type2def) end)
+	end)
+	it("should handle nonexistant groups", function()
+		assert.is_nil(A.get_group_definition("something_else"))
+	end)
+	it("should reject invalid definitions", function()
+		assert.has.errors(function() A.register_group({}) end)
+		assert.has.errors(function() A.register_group({name="",label={}}) end)
+		assert.has.errors(function() A.register_group({name="",aspects={}}) end)
+	end)
+end)
+
+describe("signal aspect", function()
+	it("should handle empty fields properly", function()
+		assert.equal(A{main = 0}, A{group="foo", name="danger"}:to_group())
+	end)
+	it("should be converted properly", function()
+		assert.equal(A{main = 0}, A{group="foo", name="danger"})
+		assert.equal(A{}, A{group="foo", name="caution"})
+		assert.equal(A{main = -1}, A{group="foo", name="proceed"})
+	end)
+end)
+
+describe("signals in groups", function()
+	it("should support distant signaling", function()
+		assert.equal("caution", A():adjust_distant(A{group="foo",name="danger"}).name)
+		assert.equal("proceed", A():adjust_distant(A{group="foo",name="caution"}).name)
+		assert.equal("proceed", A():adjust_distant(A{group="foo",name="proceed"}).name)
+		assert.equal("danger", A{group="foo",name="danger"}:adjust_distant{}.name)
+	end)
+end)
diff --git a/advtrains_interlocking/tcb_ts_ui.lua b/advtrains_interlocking/tcb_ts_ui.lua
index 9e7fcd4..bfec648 100755
--- a/advtrains_interlocking/tcb_ts_ui.lua
+++ b/advtrains_interlocking/tcb_ts_ui.lua
@@ -15,6 +15,7 @@ local lntrans = { "A", "B" }
 local function sigd_to_string(sigd)
 	return minetest.pos_to_string(sigd.p).." / "..lntrans[sigd.s]
 end
+advtrains.interlocking.sigd_to_string = sigd_to_string
 
 minetest.register_node("advtrains_interlocking:tcb_node", {
 	drawtype = "mesh",
@@ -580,7 +581,7 @@ function advtrains.interlocking.show_signalling_form(sigd, pname, sel_rte, calle
 	if not tcbs.signal then return end
 	if not tcbs.routes then tcbs.routes = {} end
 	
-	local form = "size[7,10]label[0.5,0.5;Signal at "..minetest.pos_to_string(sigd.p).."]"
+	local form = "size[7,10.25]label[0.5,0.5;Signal at "..minetest.pos_to_string(sigd.p).."]"
 	form = form.."field[0.8,1.5;5.2,1;name;Signal name;"..minetest.formspec_escape(tcbs.signal_name or "").."]"
 	form = form.."button[5.5,1.2;1,1;setname;Set]"
 	
@@ -640,12 +641,8 @@ function advtrains.interlocking.show_signalling_form(sigd, pname, sel_rte, calle
 			if hasprivs then
 				form = form.."button[0.5,8;2.5,1;newroute;New Route]"
 				form = form.."button[  3,8;2.5,1;unassign;Unassign Signal]"
-				form = form.."button[  3,9;2.5,1;influp;Influence Point]"
-			end
-			if tcbs.ars_disabled then
-				form = form.."button[0.5,9;2.5,1;arsenable;Enable ARS]"
-			else
-				form = form.."button[0.5,9;2.5,1;arsdisable;Disable ARS]"
+				form = form..string.format("checkbox[0.5,8.75;ars;Automatic routesetting;%s]", not tcbs.ars_disabled)
+				form = form..string.format("checkbox[0.5,9.25;dst;Distant signalling;%s]", not tcbs.nodst)
 			end
 		elseif sigd_equal(tcbs.route_origin, sigd) then
 			-- something has gone wrong: tcbs.routeset should have been set...
@@ -768,16 +765,13 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 				minetest.chat_send_player(pname, "Please cancel route first!")
 			end
 		end
-		if fields.influp and hasprivs then
-			advtrains.interlocking.show_ip_form(tcbs.signal, pname)
-			return
-		end
 		
-		if tcbs.ars_disabled and fields.arsenable then
-			tcbs.ars_disabled = nil
+		if fields.ars then
+			tcbs.ars_disabled = not minetest.is_yes(fields.ars)
 		end
-		if not tcbs.ars_disabled and fields.arsdisable then
-			tcbs.ars_disabled = true
+
+		if fields.dst then
+			tcbs.nodst = not minetest.is_yes(fields.dst)
 		end
 		
 		if fields.auto then
diff --git a/advtrains_interlocking/train_sections.lua b/advtrains_interlocking/train_sections.lua
index 47072dc..260f5a4 100644
--- a/advtrains_interlocking/train_sections.lua
+++ b/advtrains_interlocking/train_sections.lua
@@ -91,6 +91,13 @@ local function setsection(tid, train, ts_id, ts, sigd)
 			tcbs.route_comitted = nil -- TODO compatibility cleanup
 			tcbs.aspect = nil
 			tcbs.route_origin = nil
+			if tcbs.signal then
+				local spos = tcbs.signal
+				local _, setter = advtrains.distant.get_main(spos)
+				if setter == "routesetting" then
+					advtrains.distant.unassign_dst(spos, true)
+				end
+			end
 			advtrains.interlocking.update_signal_aspect(tcbs)
 			if tcbs.signal and sigd_equal(ts.route.entry, ts.route.origin) then
 				if tcbs.route_auto and tcbs.routeset then
diff --git a/advtrains_signals_japan/.gitignore b/advtrains_signals_japan/.gitignore
new file mode 100644
index 0000000..0969b6b
--- /dev/null
+++ b/advtrains_signals_japan/.gitignore
@@ -0,0 +1 @@
+models/*
diff --git a/advtrains_signals_japan/init.lua b/advtrains_signals_japan/init.lua
new file mode 100644
index 0000000..eb39f85
--- /dev/null
+++ b/advtrains_signals_japan/init.lua
@@ -0,0 +1,461 @@
+local pole_texture = "advtrains_signals_japan_mast.png"
+local signal_face_texture = "advtrains_hud_bg.png^[colorize:#000000:255"
+local pole_radius = 1/16
+local pole_box = {-pole_radius,-1/2,-pole_radius,pole_radius,1/2,pole_radius}
+local light_radius = 1/20
+local signal_width = 6*light_radius
+local signal_thickness = pole_radius*3
+local signal_height = {}
+local signal_box = {}
+local light_red = "advtrains_hud_bg.png^[colorize:red:255"
+local light_yellow = "advtrains_hud_bg.png^[colorize:orange:255"
+local light_green = "advtrains_hud_bg.png^[colorize:lime:255"
+local light_purple = "advtrains_hud_bg.png^[colorize:purple:255"
+local light_distant = light_purple
+local light_off = signal_face_texture
+
+do
+	local model_path_prefix = table.concat({minetest.get_modpath("advtrains_signals_japan"), "models", "advtrains_signals_japan_"}, DIR_DELIM)
+
+	local function vertex(x, y, z)
+		return string.format("v %f %f %f", x, y, z)
+	end
+	local function texture(u, v)
+		return string.format("vt %f %f", u, v)
+	end
+	local function face_element(v, vt)
+		if vt then
+			return string.format("%d/%d", v, vt)
+		end
+		return tonumber(v)
+	end
+	local function face_elements(...)
+		local st = {"f"}
+		local args = {...}
+		local len = #args
+		for i = 1, len, 2 do
+			st[(i+3)/2] = face_element(args[i], args[i+1])
+		end
+		return table.concat(st, " ")
+	end
+	local function sequential_elements(v0, vt0, count)
+		local st = {}
+		for i = 1, count do
+			st[i] = face_element(v0+i, vt0+i)
+		end
+		return table.concat(st, " ")
+	end
+	local function mod_lower(min, a, b)
+		return min + (a-min)%b
+	end
+	local function connect_circular(v0, vt0, count)
+		return "f " .. sequential_elements(v0, vt0, count)
+	end
+	local function connect_cylindrical(v0, vt0, count)
+		local st = {}
+		for i = 0, count-1 do
+			local j = (i+1)%count
+			local v1 = v0+i+1
+			local v2 = v1+count
+			local v3 = v0+j+1
+			local v4 = v3+count
+			local vt1 = vt0+i+1
+			local vt2 = vt1+count+1
+			st[i+1] = face_elements(v1, vt1, v3, vt1+1, v4, vt2+1, v2, vt2)
+		end
+		return table.concat(st, "\n")
+	end
+	local function circular_textures(u0, v0, r, count, total, angular_offset, direction)
+		local st = {}
+		if not angular_offset then
+			angular_offset = 0
+		end
+		if not total then
+			total = count
+		end
+		if not direction then
+			direction = 1
+		end
+		for i = 0, count-1 do
+			local theta = angular_offset + direction*i/total*2*math.pi
+			local u, v = r*math.cos(theta), r*math.sin(theta)
+			st[i+1] = texture(u0+u, v0+v)
+		end
+		return table.concat(st, "\n")
+	end
+	local function rectangular_textures(u0, v0, u1, v1, count)
+		local st = {}
+		local width = u1-u0
+		for i = 0, count do
+			local u = u0+i/count*width
+			st[i+1] = texture(u, v0)
+			st[i+count+2] = texture(u, v1)
+		end
+		return table.concat(st, "\n")
+	end
+
+	-- generate pole model
+	local pole_npolygon = 32
+	local pole_vertex_count = pole_npolygon*2
+	local pole_uv_count = pole_npolygon*3+2
+	local pole_vertices = {}
+	local pole_objdef = {
+		"g pole",
+		"usemtl pole",
+		connect_circular(0, 0, pole_npolygon),
+		connect_circular(pole_npolygon, 0, pole_npolygon),
+		connect_cylindrical(0, pole_npolygon, pole_npolygon),
+	}
+	local pole_uv = {
+		circular_textures(0.5, 0.5, 0.5, pole_npolygon),
+		rectangular_textures(0, 0, 1, 1, pole_npolygon),
+	}
+	for i = 0, pole_npolygon-1 do
+		local theta = i*2/pole_npolygon*math.pi
+		local r = pole_radius
+		local x, z = r*math.sin(theta), r*math.cos(theta)
+		local lower_index = i+1
+		local upper_index = lower_index+pole_npolygon
+		pole_vertices[lower_index] = vertex(x, -0.5, z)
+		pole_vertices[upper_index] = vertex(x, 0.5, z)
+	end
+	pole_vertices = table.concat(pole_vertices, "\n")
+	pole_objdef = table.concat(pole_objdef, "\n")
+	pole_uv = table.concat(pole_uv, "\n")
+	minetest.safe_file_write(model_path_prefix .. "pole.obj", table.concat({pole_vertices, pole_uv, pole_objdef}, "\n"))
+
+	-- generate signals
+	for lightcount = 5, 6 do
+		for rotname, rot in pairs {["0"] = 0, ["30"] = 26.5, ["45"] = 45, ["60"] = 63.5} do
+			local rot = math.rad(rot)
+			local lightradius = 0.05
+			local lightspacing = 0.04
+			local halfwidth = signal_width/2
+			local halfheight = (2+lightcount)*lightradius+(lightcount-1)*lightspacing/2
+			local halfthickness = signal_thickness/2
+			local half_npolygon = pole_npolygon/2
+			local quarter_npolygon = pole_npolygon/4
+			local boxside = math.max(halfwidth, halfthickness*2)
+			signal_height[lightcount] = halfheight*2
+			signal_box[lightcount] = {-boxside, -halfheight, -boxside, boxside, halfheight, boxside}
+
+			local _vertex = vertex
+			local rv = vector.new(0, rot, 0)
+			local function vertex(x, y, z)
+				local v = vector.rotate(vector.new(x, y, z), rv)
+				return _vertex(v.x, v.y, v.z)
+			end
+
+			-- generate signal face
+			local face_vertices = {}
+			local face_uv = {
+				circular_textures(0.5, 0.5+halfheight-3*lightradius, halfwidth, half_npolygon+1, pole_npolygon),
+				circular_textures(0.5, 0.5-halfheight+3*lightradius, halfwidth, half_npolygon+1, pole_npolygon, math.pi),
+				rectangular_textures(0, 0, 1, 1, 2+pole_npolygon),
+			}
+			local face_objdef = {
+				"g face",
+				"usemtl face",
+				connect_circular(pole_vertex_count+2+pole_npolygon, pole_uv_count, 2+pole_npolygon),
+				connect_circular(pole_vertex_count, pole_uv_count, 2+pole_npolygon),
+				connect_cylindrical(pole_vertex_count, pole_uv_count+2+pole_npolygon, 2+pole_npolygon),
+			}
+			local face_vertex_count = 4*half_npolygon+4
+			local face_uv_count = 2*(half_npolygon+1) + 2*(pole_npolygon+3)
+			for i = 0, half_npolygon do
+				local theta = i/half_npolygon*math.pi
+				local r = halfwidth
+				local x, y = r*math.cos(theta), halfheight-3*lightradius+r*math.sin(theta)
+				face_vertices[i+1] = vertex(x, y, -halfthickness)
+				face_vertices[i+2+half_npolygon] = vertex(-x, -y, -halfthickness)
+				face_vertices[i+3+2*half_npolygon] = vertex(x, y, halfthickness)
+				face_vertices[i+4+3*half_npolygon] = vertex(-x, -y, halfthickness)
+			end
+
+			-- generate lights
+			local light_vertices = {}
+			local light_vertex_count = 8*(half_npolygon+1)+pole_npolygon
+			local light_uv = {rectangular_textures(0, 0, 1, 1, half_npolygon)}
+			local light_uv_count = 2*(half_npolygon+1)+pole_npolygon*lightcount
+			local light_objdef_face = {}
+			local light_objdef_main = {
+				"g light",
+				"usemtl light",
+			}
+			for i = 1, lightcount do
+				local x0, y0 = 0, -halfheight + (2*i+1)*lightradius + (i-1)*lightspacing
+				local v0 = light_vertex_count*(i-1)
+				for j = 0, half_npolygon do
+					local theta = j/half_npolygon*math.pi
+					local xs, ys = math.cos(theta), math.sin(theta)
+					for k, v in pairs {
+						{xm = -1, ym = 1, rm = 1, z = 1},
+						{xm = 1, ym = 1, rm = 0.8, z = 1},
+						{xm = -1, ym = 1, rm = 1, z = 2},
+						{xm = 1, ym = 1, rm = 0.8, z = 2},
+						{xm = 1, ym = -1, rm = 1, z = 1},
+						{xm = -1, ym = -1, rm = 0.8, z = 1},
+						{xm = 1, ym = -1, rm = 1, z = 1.5},
+						{xm = -1, ym = -1, rm = 0.8, z = 1.5},
+					} do
+						local x = x0+xs*lightradius*v.xm*v.rm
+						local y = y0+ys*lightradius*v.ym*v.rm
+						light_vertices[v0+(k-1)*(half_npolygon+1)+j+1] = vertex(x, y, -halfthickness*v.z)
+					end
+				end
+				for j = 0, pole_npolygon-1 do
+					local theta = j/pole_npolygon*2*math.pi
+					local x, y = math.cos(theta), math.sin(theta)
+					light_vertices[v0+8*(half_npolygon+1)+1+j] = vertex(x0+lightradius*x, y0+lightradius*y, -halfthickness*1.05)
+				end
+				local v0 = pole_vertex_count+face_vertex_count+v0
+				local vt0 = pole_uv_count + face_uv_count
+				local ostep = 2*half_npolygon+2
+				for j = 1, half_npolygon do
+					local dv = 2*(half_npolygon+1)
+					local v0 = v0 + dv
+					local vn = v0 + dv
+					light_objdef_face[i*ostep-j+1] = face_elements(v0+j, vt0+j, v0+j+1, vt0+j+1, vn-j, vt0+half_npolygon+2+j, vn-j+1, vt0+half_npolygon+1+j)
+					local v0 = vn + dv
+					local vn = v0 + dv
+					light_objdef_face[i*ostep-half_npolygon-j+1] = face_elements(v0+j, vt0+j, v0+j+1, vt0+j+1, vn-j, vt0+half_npolygon+2+j, vn-j+1, vt0+half_npolygon+1+j)
+				end
+				local vt0 = vt0 + 2*(half_npolygon+1) + (i-1)*pole_npolygon
+				light_uv[i+1] = circular_textures(0.5, (i-1/2)/lightcount, 0.4/lightcount, pole_npolygon)
+				light_objdef_face[(i-1)*ostep+1] = connect_cylindrical(v0, pole_uv_count+2+pole_npolygon, 2+pole_npolygon)
+				light_objdef_face[(i-1)*ostep+2] = connect_cylindrical(v0+4*(half_npolygon+1), pole_uv_count+2+pole_npolygon, 2+pole_npolygon)
+				light_objdef_main[2+i] = connect_circular(v0+8*(half_npolygon+1), vt0, pole_npolygon)
+			end
+
+			-- write file
+			face_vertices = table.concat(face_vertices, "\n")
+			face_uv = table.concat(face_uv, "\n")
+			face_objdef = table.concat(face_objdef, "\n")
+			minetest.safe_file_write(model_path_prefix .. lightcount .. "_" .. rotname .. ".obj", table.concat({
+				pole_vertices,
+				face_vertices,
+				table.concat(light_vertices, "\n"),
+				pole_uv,
+				face_uv,
+				table.concat(light_uv, "\n"),
+				pole_objdef,
+				face_objdef,
+				table.concat(light_objdef_face, "\n"),
+				table.concat(light_objdef_main, "\n"),
+			}, "\n"))
+		end
+	end
+end
+
+local S = attrans
+
+minetest.register_node("advtrains_signals_japan:pole_0", {
+	description = S("Japanese signal pole"),
+	drawtype = "mesh",
+	mesh = "advtrains_signals_japan_pole.obj",
+	tiles = {pole_texture},
+
+	paramtype = "light",
+	sunlight_propagates = true,
+
+	paramtype2 = "none",
+	selection_box = {
+		type = "fixed",
+		fixed = {pole_box},
+	},
+	collision_box = {
+		type = "fixed",
+		fixed = {pole_box},
+	},
+	groups = {
+		cracky = 2,
+		not_blocking_trains = 1,
+		not_in_creative_inventory = 0,
+	},
+	drop = "advtrains_signals_japan:pole_0",
+})
+
+--[[
+advtrains.interlocking.aspect.register_group {
+	name = "advtrains_signals_japan:5a",
+	label = S("Japanese signal"),
+	aspects = {
+		danger = {
+			label = S"Danger (halt)",
+			main = 0,
+		},
+		restrictedspeed = {
+			label = S"Restricted speed",
+		},
+		caution = {
+			label = S"Caution",
+		},
+		reducedspeed = {
+			label = S"Reduced speed",
+		},
+		clear = {
+			label = S"Clear (proceed)",
+		},
+		"clear",
+		"reducedspeed",
+		"caution",
+		"restrictedspeed",
+		"danger",
+	}
+}]]
+
+local sigdefs = {}
+local lightcolors = {
+	red = "red",
+	green = "lime",
+	yellow = "orange",
+	distant = "purple",
+}
+local function process_signal(name, sigdata, isrpt)
+	local def = {}
+	local tx = {}
+	def.textures = tx
+	def.desc = sigdata.desc
+	def.isdst = isrpt
+	def.aspects = sigdata.aspects
+	local lights = sigdata.lights
+	local lightcount = #lights
+	if isrpt then
+		lightcount = lightcount+1
+	end
+	def.lightcount = lightcount
+	def.suppasp_names = {}
+	for idx, asp in ipairs(sigdata.aspects) do
+		local aspname = asp.name
+		local tt = {
+			string.format("[combine:1x%d", lightcount),
+			string.format("0,0=(advtrains_hud_bg.png\\^[resize\\:1x%d\\^[colorize\\:#000)", lightcount),
+		}
+		for _, i in pairs(asp.lights) do
+			local color = lightcolors[lights[i]]
+			tt[#tt+1] = string.format("0,%d=(advtrains_hud_bg.png\\^[colorize\\:%s)", i-1, color)
+		end
+		if isrpt then
+			local color = lightcolors.distant
+			tt[#tt+1] = string.format("0,%d=(advtrains_hud_bg.png\\^[colorize\\:%s)", lightcount-1, color)
+		end
+		tx[aspname] = table.concat(tt, ":")
+		def.suppasp_names[idx] = aspname
+	end
+	local invimg = {
+		string.format("[combine:%dx%d", lightcount*4+1, lightcount*4+1),
+		string.format("%d,0=(advtrains_hud_bg.png\\^[resize\\:5x%d\\^[colorize\\:#000)", lightcount*2-2, lightcount*4+1),
+	}
+	for i, c in pairs(lights) do
+		local color = lightcolors[c]
+		invimg[i+2] = string.format("%d,%d=(advtrains_hud_bg.png\\^[resize\\:3x3\\^[colorize\\:%s)", 2*lightcount-1, 4*i-3, color)
+	end
+	if isrpt then
+		invimg[lightcount+2] = string.format("%d,%d=(advtrains_hud_bg.png\\^[resize\\:3x3\\^[colorize\\:%s)", 2*lightcount-1, 4*lightcount-3, lightcolors.distant)
+	end
+	def.inventory_image = table.concat(invimg, ":")
+	return def
+end
+for sigtype, sigdata in pairs {
+	["5a"] = {
+		desc = "5A",
+		lights = {"yellow", "yellow", "red", "yellow", "green"},
+		aspects = {
+			{name = "clear", description = S"Clear (proceed)", lights = {5}, main = -1},
+			{name = "reducedspeed", description = S"Reduced speed", lights = {2, 5}, main = 12},
+			{name = "caution", description = S"Caution", lights = {4}},
+			{name = "restrictedspeed", description = S"Restricted speed", lights = {1, 4}, main = 6},
+			{name = "danger", description = S"Danger (halt)", lights = {3}, main = 0},
+		}
+	}
+} do
+	sigdefs["main_"..sigtype] = process_signal(sigtype, sigdata)
+	-- TODO re-enable this once ready
+	--sigdefs["rpt_"..sigtype] = process_signal(sigtype, sigdata, true)
+end
+
+for k in pairs(sigdefs) do
+	advtrains.trackplacer.register_tracktype("advtrains_signals_japan:"..k)
+end
+
+for _, rtab in ipairs {
+	{rot = "0", ici = true},
+	{rot = "30"},
+	{rot = "45"},
+	{rot = "60"},
+} do
+	local rot = rtab.rot
+	for sigtype, siginfo in pairs(sigdefs) do
+		local lightcount = siginfo.lightcount
+		for asp, texture in pairs(siginfo.textures) do
+			minetest.register_node("advtrains_signals_japan:"..sigtype.."_"..asp.."_"..rot, {
+				description = attrans(string.format("Japanese%s signal (type %s)", siginfo.isdst and " repeating" or "", siginfo.desc)),
+				drawtype = "mesh",
+				mesh = string.format("advtrains_signals_japan_%d_%s.obj", lightcount, rot),
+				tiles = {pole_texture, signal_face_texture, texture},
+				paramtype = "light",
+				sunlight_propagates = true,
+				light_source = 4,
+				paramtype2 = "facedir",
+				selection_box = {
+					type = "fixed",
+					fixed = {pole_box, signal_box[lightcount]},
+				},
+				collision_box = {
+					type = "fixed",
+					fixed = {pole_box, signal_box[lightcount]},
+				},
+				groups = {
+					cracky = 2,
+					advtrains_signal = 2,
+					not_blocking_trains = 1,
+					save_in_at_nodedb = 1,
+					not_in_creative_inventory = rtab.ici and asp == "danger" and 0 or 1,
+				},
+				inventory_image = siginfo.inventory_image,
+				drop = "advtrains_signals_japan:"..sigtype.."_danger_0",
+				advtrains = {
+					main_aspects = siginfo.aspects,
+					apply_aspect = function(pos, node, main_aspect, rem_aspect, rem_aspinfo)
+						local asp_name = main_aspect and main_aspect.name or "danger"
+						-- if this signal is clear and remote signal is restrictive (<= 10) then degrade to caution aspect
+						if not main_aspect or main_aspect.name == "halt" then
+							asp_name = "danger"
+						elseif main_aspect.name == "clear" and rem_aspinfo and rem_aspinfo.main and rem_aspinfo.main >= 0 and rem_aspinfo.main <= 10 then
+							asp_name = "caution"
+						end
+						advtrains.ndb.swap_node(pos, {name="advtrains_signals_japan:"..sigtype.."_"..asp_name.."_"..rot, param2 = node.param2})
+					end,
+					get_aspect_info = function(pos, main_aspect)
+						return {
+							main = main_aspect.main,
+							proceed_as_main = true,
+						}
+					end,
+				--[[
+					supported_aspects = {
+						group = "advtrains_signals_japan:5a",
+						name = siginfo.suppasp_names,
+						dst_shift = siginfo.isdst and 0,
+						main = (not siginfo.isdst) and {} or false
+					},
+					get_aspect = function()
+						local main
+						if siginfo.isdst then
+							main = false
+						end
+						return {group = "advtrains_signals_japan:5a", name = asp, main = main}
+					end,
+					set_aspect = function(pos, node, asp)
+						advtrains.ndb.swap_node(pos, {name = "advtrains_signals_japan:"..sigtype.."_"..(asp.name).."_"..rot, param2 = node.param2})
+					end,
+				]]
+				},
+				on_rightclick = advtrains.interlocking.signal_rc_handler,
+				can_dig = advtrains.interlocking.signal_can_dig,
+				after_dig_node = advtrains.interlocking.signal_after_dig,
+			})
+			advtrains.trackplacer.add_worked("advtrains_signals_japan:"..sigtype, asp, "_"..rot)
+		end
+	end
+end
diff --git a/advtrains_signals_japan/mod.conf b/advtrains_signals_japan/mod.conf
new file mode 100644
index 0000000..8cb2cb3
--- /dev/null
+++ b/advtrains_signals_japan/mod.conf
@@ -0,0 +1,6 @@
+name=advtrains_signals_japan
+title=Advtrains Interlocking Signal Set - Japanese Signals
+description=Japanese signal set for the Advanced Trains Interlocking system
+author=yw05
+
+depends=advtrains_interlocking
diff --git a/advtrains_signals_japan/textures/advtrains_signals_japan_mast.png b/advtrains_signals_japan/textures/advtrains_signals_japan_mast.png
new file mode 100644
index 0000000..8d288a9
--- /dev/null
+++ b/advtrains_signals_japan/textures/advtrains_signals_japan_mast.png
diff --git a/advtrains_signals_ks/init.lua b/advtrains_signals_ks/init.lua
index 99d059a..67e0fec 100755
--- a/advtrains_signals_ks/init.lua
+++ b/advtrains_signals_ks/init.lua
@@ -11,10 +11,9 @@ local function asp_to_zs3type(asp)
 	return math.min(16,4*math.floor(n/4))
 end
 
-local function setzs3(msp, lim, rot)
+local function setzs3(msp, asp, rot)
 	local pos = {x = msp.x, y = msp.y+1, z = msp.z}
 	local node = advtrains.ndb.get_node(pos)
-	local asp = asp_to_zs3type(lim)
 	if node.name:find("^advtrains_signals_ks:zs3_") then
 		advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:zs3_"..asp.."_"..rot, param2 = node.param2})
 	end
@@ -49,68 +48,107 @@ local function getzs3v(msp)
 	return speed
 end
 
-local setaspectf = function(rot)
- return function(pos, node, asp)
-	setzs3(pos, asp.main, rot)
-	if asp.main == 0 then
-		if asp.shunt then
-			advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_shunt_"..rot, param2 = node.param2})
-		else
-			advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_danger_"..rot, param2 = node.param2})
-		end
+local applyaspectf_main = function(rot)
+ return function(pos, node, main_aspect, dst_aspect, dst_aspect_info)
+	-- set zs3 signal to show speed according to main_aspect
+	setzs3(pos, main_aspect.zs3, rot)
+	-- select appropriate lamps based on mainaspect and dst
+	if main_aspect.shunt then
+		advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_shunt_"..rot, param2 = node.param2})
+		setzs3v(pos, nil, rot)
+	elseif main_aspect.halt then
+		advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_danger_"..rot, param2 = node.param2})
 		setzs3v(pos, nil, rot)
 	else
-		if not asp.dst or asp.dst == -1 then
+		if not dst_aspect_info
+				or not dst_aspect_info.main
+				or dst_aspect_info.main == -1 then
 			advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_free_"..rot, param2 = node.param2})
-		elseif asp.dst == 0 then
+			setzs3v(pos, nil, rot)
+		elseif dst_aspect_info.main == 0 then
 			advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_slow_"..rot, param2 = node.param2})
+			setzs3v(pos, nil, rot)
 		else
 			advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:hs_nextslow_"..rot, param2 = node.param2})
+			setzs3v(pos, dst_aspect_info.main, rot)
 		end
-		setzs3v(pos, asp.dst, rot)
 	end
  end
 end
 
-
-local suppasp = {
-		main = {0, 4, 6, 8, 12, 16, -1},
-		dst = {0, 4, 6, 8, 12, 16, -1, false},
-		shunt = nil,
-		proceed_as_main = true,
-		info = {
-			call_on = false,
-			dead_end = false,
-			w_speed = nil,
-		}
+-- Main aspects main signal
+-- These aspects tell only the speed signalization at this signal.
+-- Actual signal aspect is chosen based on this and the Dst signal.
+local mainaspects_main = {
+	{
+		name = "proceed",
+		description = "Proceed",
+		zs3 = "off"
+	},
+	{
+		name = "shunt",
+		description = "Shunt",
+		zs3 = "off",
+		shunt = true,
+	},
+	{
+		name = "proceed_16",
+		description = "Proceed (speed 16)",
+		zs3 = "16",
+	},
+	{
+		name = "proceed_12",
+		description = "Proceed (speed 12)",
+		zs3 = "12",
+	},
+	{
+		name = "proceed_8",
+		description = "Proceed (speed 8)",
+		zs3 = "8",
+	},
+	{
+		name = "proceed_6",
+		description = "Proceed (speed 6)",
+		zs3 = "6",
+	},
+	{
+		name = "proceed_4",
+		description = "Proceed (speed 4)",
+		zs3 = "4",
+	},
+	{
+		name = "halt",
+		description = "Halt",
+		zs3 = "off",
+		halt = true,
+	},
 }
 
 --Rangiersignal
-local setaspectf_ra = function(rot)
- return function(pos, node, asp)
-	if asp.shunt then
+local applyaspectf_ra = function(rot)
+ -- we get here the full main_aspect table
+ return function(pos, node, main_aspect, dst_aspect, dst_aspect_info)
+	if main_aspect.shunt then
 		advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:ra_shuntd_"..rot, param2 = node.param2})
 	else
 		advtrains.ndb.swap_node(pos, {name="advtrains_signals_ks:ra_danger_"..rot, param2 = node.param2})
 	end
-	local meta = minetest.get_meta(pos)
-	if meta then
-		meta:set_string("infotext", minetest.serialize(asp))
-	end
  end
 end
 
-local suppasp_ra = {
-		main = { false },
-		dst = { false },
-		shunt = nil,
-		proceed_as_main = false,
-		
-		info = {
-			call_on = false,
-			dead_end = false,
-			w_speed = nil,
-		}
+-- Main aspects shunt signal
+-- Shunt signals have only two states, distant doesn't matter
+local mainaspects_shunt = {
+	{
+		name = "shunt",
+		description = "Shunt",
+		shunt = true,
+	},
+	{
+		name = "halt",
+		description = "Halt",
+		halt = true,
+	},
 }
 
 for _, rtab in ipairs({
@@ -121,7 +159,7 @@ for _, rtab in ipairs({
 	}) do
 	local rot = rtab.rot
 	for typ, prts in pairs({
-			danger   = {asp = advtrains.interlocking.DANGER, n = "slow", ici=true},
+			danger   = {asp = advtrains.interlocking.signal.ASPI_HALT, n = "slow", ici=true},
 			slow     = {
 				asp = function(pos)
 					return { main = getzs3(pos) or -1, proceed_as_main = true, dst = 0 }
@@ -183,9 +221,9 @@ for _, rtab in ipairs({
 			drop = "advtrains_signals_ks:hs_danger_0",
 			inventory_image = "advtrains_signals_ks_hs_inv.png",
 			advtrains = {
-				set_aspect = setaspectf(rot),
-				supported_aspects = suppasp,
-				get_aspect = afunc,
+				main_aspects = mainaspects_main,
+				apply_aspect = applyaspectf_main(rot),
+				get_aspect_info = afunc,
 			},
 			on_rightclick = advtrains.interlocking.signal_rc_handler,
 			can_dig = advtrains.interlocking.signal_can_dig,
@@ -226,11 +264,9 @@ for _, rtab in ipairs({
 			drop = "advtrains_signals_ks:ra_danger_0",
 			inventory_image = "advtrains_signals_ks_ra_inv.png",
 			advtrains = {
-				set_aspect = setaspectf_ra(rot),
-				supported_aspects = suppasp_ra,
-				get_aspect = function(pos, node)
-					return prts.asp
-				end,
+				main_aspects = mainaspects_ra,
+				apply_aspect = applyaspectf_ra(rot),
+				get_aspect_info = prts.asp,
 			},
 			on_rightclick = advtrains.interlocking.signal_rc_handler,
 			can_dig = advtrains.interlocking.signal_can_dig,
@@ -267,7 +303,7 @@ for _, rtab in ipairs({
 			drop = "advtrains_signals_ks:"..prefix.."_"..dtyp.."_0",
 			inventory_image = inv,
 			advtrains = {
-				get_aspect = function() return asp end
+				get_aspect_info = asp
 			},
 			on_rightclick = advtrains.interlocking.signal_rc_handler,
 			can_dig = advtrains.interlocking.signal_can_dig,
@@ -278,13 +314,19 @@ for _, rtab in ipairs({
 	end
 
 	for typ, prts in pairs {
-		["hfs"] = {asp = {main = false, shunt = false}, n = "pam", mesh = "_hfs"},
-		["pam"] = {asp = {main = -1, shunt = false, proceed_as_main = true}, n = "hfs"}
+		["hfs"] = {asp = {main = false, shunt = false}, n = "pam", mesh = "_hfs", owntile = true},
+		["pam"] = {asp = {main = -1, shunt = false, proceed_as_main = true}, n = "ne4"},
+		["ne4"] = {asp = {}, n = "ne3x1", mesh="_ne4", owntile = true},
+		["ne3x1"] = {asp = {}, n = "ne3x2", mesh="_ne3", owntile = true},
+		["ne3x2"] = {asp = {}, n = "ne3x3", mesh="_ne3", owntile = true},
+		["ne3x3"] = {asp = {}, n = "ne3x4", mesh="_ne3", owntile = true},
+		["ne3x4"] = {asp = {}, n = "ne3x5", mesh="_ne3", owntile = true},
+		["ne3x5"] = {asp = {}, n = "hfs", mesh="_ne3", owntile = true},
 	} do
 		local mesh = prts.mesh or ""
 		local tile2 = "advtrains_signals_ks_sign_lf7.png^(advtrains_signals_ks_sign_"..typ..".png^[makealpha:255,255,255)"
-		if typ == "hfs" then
-			tile2 = "advtrains_signals_ks_sign_hfs.png"
+		if prts.owntile then
+			tile2 = "advtrains_signals_ks_sign_"..typ..".png"
 		end
 		register_sign("sign", typ, prts.n, "Signal Sign", "sign"..mesh, tile2, "hfs", "advtrains_signals_ks_sign_lf7.png", prts.asp)
 	end
diff --git a/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne3_smr0.obj b/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne3_smr0.obj
new file mode 100644
index 0000000..01bc666
--- /dev/null
+++ b/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne3_smr0.obj
@@ -0,0 +1,212 @@
+# Blender v3.0.0 OBJ File: ''
+# www.blender.org
+mtllib advtrains_signals_ks_sign_ne3_smr0.mtl
+o Cube.001
+v 0.100000 1.200000 -0.324543
+v 0.100000 1.200000 -0.344543
+v -0.100000 1.200000 -0.344543
+v -0.100000 1.200000 -0.324543
+v -0.100000 0.700000 -0.324543
+v 0.100000 0.700000 -0.324543
+v 0.100000 0.700000 -0.344543
+v -0.100000 0.700000 -0.344543
+v 0.024805 1.055075 -0.324528
+v 0.000000 1.055075 -0.334802
+v 0.000000 1.055075 -0.334802
+v 0.024805 1.055075 -0.324528
+v -0.035079 1.055075 -0.299723
+v -0.024805 1.055075 -0.274918
+v -0.024805 1.055075 -0.274918
+v -0.035079 1.055075 -0.299723
+v 0.024805 1.055075 -0.274918
+v 0.035079 1.055075 -0.299723
+v 0.035079 1.055075 -0.299723
+v 0.024805 1.055075 -0.274918
+v -0.024805 1.055075 -0.324528
+v -0.024805 1.055075 -0.324528
+v 0.000000 1.055075 -0.264644
+v 0.000000 1.055075 -0.264644
+v 0.024805 -0.499729 -0.274918
+v 0.035080 -0.499729 -0.299723
+v 0.000000 -0.499729 -0.264644
+v 0.024805 -0.499729 -0.324528
+v 0.000000 -0.499729 -0.334802
+v -0.024804 -0.499729 -0.274918
+v -0.024804 -0.499729 -0.324528
+v -0.035079 -0.499729 -0.299723
+v 0.100000 1.150000 -0.344543
+v 0.100000 1.100000 -0.344543
+v 0.100000 1.050000 -0.344543
+v 0.100000 1.000000 -0.344543
+v 0.100000 0.950000 -0.344543
+v 0.100000 0.900000 -0.344543
+v 0.100000 0.850000 -0.344543
+v 0.100000 0.800000 -0.344543
+v 0.100000 0.750000 -0.344543
+v -0.100000 1.150000 -0.344543
+v -0.100000 1.100000 -0.344543
+v -0.100000 1.050000 -0.344543
+v -0.100000 1.000000 -0.344543
+v -0.100000 0.950000 -0.344543
+v -0.100000 0.900000 -0.344543
+v -0.100000 0.850000 -0.344543
+v -0.100000 0.800000 -0.344543
+v -0.100000 0.750000 -0.344543
+vt 0.583333 0.750000
+vt 0.583333 0.500000
+vt 0.583333 0.250000
+vt 0.583333 1.000000
+vt 0.125000 0.500000
+vt 0.375000 0.500000
+vt 0.375000 0.750000
+vt 0.125000 0.750000
+vt 0.583333 0.000000
+vt 0.562500 0.250000
+vt 0.541666 0.250000
+vt 0.520833 0.250000
+vt 0.500000 0.250000
+vt 0.479166 0.250000
+vt 0.458333 0.250000
+vt 0.437500 0.250000
+vt 0.416667 0.250000
+vt 0.395833 0.250000
+vt 0.375000 0.250000
+vt 0.375000 0.000000
+vt 0.541666 0.500000
+vt 0.562500 0.500000
+vt 0.395833 0.500000
+vt 0.416667 0.500000
+vt 0.437500 0.500000
+vt 0.458333 0.500000
+vt 0.479166 0.500000
+vt 0.500000 0.500000
+vt 0.520833 0.500000
+vt 0.375000 1.000000
+vt 0.372863 0.578719
+vt 0.372317 0.613951
+vt 0.371666 0.613734
+vt 0.372221 0.578991
+vt 0.315877 0.640082
+vt 0.292344 0.614764
+vt 0.292986 0.614492
+vt 0.316131 0.639438
+vt 0.315346 0.553400
+vt 0.349331 0.553400
+vt 0.349077 0.554044
+vt 0.315664 0.554020
+vt 0.349861 0.640082
+vt 0.349543 0.639462
+vt 0.292889 0.579531
+vt 0.293541 0.579748
+vt 0.444102 0.636706
+vt 0.409596 0.636706
+vt 0.385196 0.612306
+vt 0.385196 0.577799
+vt 0.409596 0.553400
+vt 0.444102 0.553400
+vt 0.468502 0.577800
+vt 0.468502 0.612306
+vt 0.037160 1.987962
+vt 0.036793 0.000397
+vt 0.071486 0.000384
+vt 0.071853 1.987948
+vt 0.002468 1.987974
+vt 0.002100 0.000409
+vt 0.106546 1.987936
+vt 0.106179 0.000371
+vt 0.140872 0.000358
+vt 0.141239 1.987923
+vt 0.245318 1.987885
+vt 0.244951 0.000319
+vt 0.279643 0.000307
+vt 0.280011 1.987871
+vt 0.175932 1.987910
+vt 0.175565 0.000345
+vt 0.210258 0.000332
+vt 0.210625 1.987897
+vt 0.812500 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.937500
+vt 0.000000 0.875000
+vt 0.812500 0.875000
+vt 0.812500 0.937500
+vt 0.000000 0.812500
+vt 0.812500 0.812500
+vt 0.000000 0.750000
+vt 0.812500 0.750000
+vt 0.000000 0.687500
+vt 0.812500 0.687500
+vt 0.000000 0.625000
+vt 0.812500 0.625000
+vt 0.000000 0.562500
+vt 0.812500 0.562500
+vt 0.000000 0.500000
+vt 0.812500 0.500000
+vt 0.000000 0.437500
+vt 0.812500 0.437500
+vt 0.000000 0.375000
+vt 0.812500 0.375000
+vt 0.812500 1.000000
+vt 0.000000 0.937500
+vt 0.812500 0.937500
+vn 0.9239 0.3827 -0.0000
+vn -0.0000 0.3826 -0.9239
+vn -0.9239 0.3827 -0.0001
+vn 0.0000 0.3827 0.9239
+vn 0.7071 -0.7071 0.0000
+vn -0.7071 -0.7071 -0.0000
+vn -1.0000 0.0000 0.0000
+vn 1.0000 0.0000 0.0000
+vn 0.0000 -0.0000 1.0000
+vn 0.0000 1.0000 0.0000
+vn 0.9239 0.0000 0.3827
+vn 0.3827 -0.0000 0.9239
+vn 0.3827 0.0000 -0.9239
+vn 0.9239 0.0000 -0.3827
+vn -0.3827 -0.0000 0.9239
+vn -0.9239 -0.0000 -0.3827
+vn -0.9239 -0.0000 0.3827
+vn -0.3827 -0.0000 -0.9239
+vn -0.3952 0.8351 -0.3827
+vn 0.0000 0.0000 -1.0000
+vn 0.0000 0.7071 -0.7071
+g Cube.001_Cube.001_Default_OBJ
+usemtl Default_OBJ
+s off
+f 1/1/1 2/2/2 3/3/3 4/4/4
+f 8/5/5 7/6/6 6/7/6 5/8/5
+f 4/9/7 3/3/7 42/10/7 43/11/7 44/12/7 45/13/7 46/14/7 47/15/7 48/16/7 49/17/7 50/18/7 8/19/7 5/20/7
+f 34/21/8 33/22/8 2/2/8 1/1/8 6/7/8 7/6/8 41/23/8 40/24/8 39/25/8 38/26/8 37/27/8 36/28/8 35/29/8
+f 1/1/9 4/4/9 5/30/9 6/7/9
+s 1
+f 9/31/9 10/32/9 11/33/9 12/34/9
+f 13/35/9 14/36/9 15/37/9 16/38/9
+f 17/39/9 18/40/9 19/41/9 20/42/9
+f 10/32/9 21/43/9 22/44/9 11/33/9
+f 14/36/9 23/45/9 24/46/9 15/37/9
+f 18/40/9 9/31/9 12/34/9 19/41/9
+f 21/47/10 13/48/10 14/49/10 23/50/10 17/51/10 18/52/10 9/53/10 10/54/10
+f 20/55/11 25/56/11 26/57/11 19/58/11
+f 21/43/9 13/35/9 16/38/9 22/44/9
+f 23/45/9 17/39/9 20/42/9 24/46/9
+f 24/59/12 27/60/12 25/56/12 20/55/12
+f 12/61/13 28/62/13 29/63/13 11/64/13
+f 19/58/14 26/57/14 28/62/14 12/61/14
+f 15/65/15 30/66/15 27/67/15 24/68/15
+f 22/69/16 31/70/16 32/71/16 16/72/16
+f 16/72/17 32/71/17 30/66/17 15/65/17
+f 11/64/18 29/63/18 31/70/18 22/69/18
+g Cube.001_Cube.001_Anzeige
+usemtl Anzeige
+s off
+f 3/73/19 2/74/20 33/75/20
+f 34/76/20 42/77/20 3/78/20 33/75/20
+f 35/79/20 43/80/20 42/77/20 34/76/20
+f 36/81/20 44/82/20 43/80/20 35/79/20
+f 37/83/20 45/84/20 44/82/20 36/81/20
+f 38/85/20 46/86/20 45/84/20 37/83/20
+f 39/87/20 47/88/20 46/86/20 38/85/20
+f 40/89/20 48/90/20 47/88/20 39/87/20
+f 41/91/20 49/92/20 48/90/20 40/89/20
+f 7/93/20 50/94/20 49/92/20 41/91/20
+f 50/95/20 7/96/20 8/97/21
diff --git a/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne3_smr30.obj b/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne3_smr30.obj
new file mode 100644
index 0000000..a20c0bf
--- /dev/null
+++ b/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne3_smr30.obj
@@ -0,0 +1,213 @@
+# Blender v3.0.0 OBJ File: ''
+# www.blender.org
+mtllib advtrains_signals_ks_sign_ne3_smr30.mtl
+o Cube.001
+v 0.234304 1.200000 -0.245825
+v 0.243228 1.200000 -0.263724
+v 0.064241 1.200000 -0.352963
+v 0.055317 1.200000 -0.335064
+v 0.055317 0.700000 -0.335064
+v 0.234304 0.700000 -0.245825
+v 0.243228 0.700000 -0.263724
+v 0.064241 0.700000 -0.352963
+v 0.167003 1.055075 -0.279363
+v 0.149388 1.055075 -0.299626
+v 0.149388 1.055075 -0.299626
+v 0.167003 1.055075 -0.279363
+v 0.102342 1.055075 -0.283885
+v 0.100469 1.055075 -0.257101
+v 0.100469 1.055075 -0.257101
+v 0.102342 1.055075 -0.283885
+v 0.144867 1.055075 -0.234966
+v 0.165129 1.055075 -0.252580
+v 0.165129 1.055075 -0.252580
+v 0.144867 1.055075 -0.234966
+v 0.122605 1.055075 -0.301499
+v 0.122605 1.055075 -0.301499
+v 0.118084 1.055075 -0.236839
+v 0.118084 1.055075 -0.236839
+v 0.144867 -0.499729 -0.234966
+v 0.165130 -0.499729 -0.252580
+v 0.118084 -0.499729 -0.236839
+v 0.167003 -0.499729 -0.279363
+v 0.149388 -0.499729 -0.299626
+v 0.100470 -0.499729 -0.257101
+v 0.122606 -0.499729 -0.301499
+v 0.102342 -0.499729 -0.283885
+v 0.243228 1.150000 -0.263724
+v 0.243228 1.100000 -0.263724
+v 0.243228 1.050000 -0.263724
+v 0.243228 1.000000 -0.263724
+v 0.243228 0.950000 -0.263724
+v 0.243228 0.900000 -0.263724
+v 0.243228 0.850000 -0.263724
+v 0.243228 0.800000 -0.263724
+v 0.243228 0.750000 -0.263724
+v 0.064241 1.150000 -0.352963
+v 0.064241 1.100000 -0.352963
+v 0.064241 1.050000 -0.352963
+v 0.064241 1.000000 -0.352963
+v 0.064241 0.950000 -0.352963
+v 0.064241 0.900000 -0.352963
+v 0.064241 0.850000 -0.352963
+v 0.064241 0.800000 -0.352963
+v 0.064241 0.750000 -0.352963
+vt 0.583333 0.750000
+vt 0.583333 0.500000
+vt 0.583333 0.250000
+vt 0.583333 1.000000
+vt 0.125000 0.500000
+vt 0.375000 0.500000
+vt 0.375000 0.750000
+vt 0.125000 0.750000
+vt 0.583333 0.000000
+vt 0.562500 0.250000
+vt 0.541666 0.250000
+vt 0.520833 0.250000
+vt 0.500000 0.250000
+vt 0.479166 0.250000
+vt 0.458333 0.250000
+vt 0.437500 0.250000
+vt 0.416667 0.250000
+vt 0.395833 0.250000
+vt 0.375000 0.250000
+vt 0.375000 0.000000
+vt 0.541666 0.500000
+vt 0.562500 0.500000
+vt 0.395833 0.500000
+vt 0.416667 0.500000
+vt 0.437500 0.500000
+vt 0.458333 0.500000
+vt 0.479166 0.500000
+vt 0.500000 0.500000
+vt 0.520833 0.500000
+vt 0.375000 1.000000
+vt 0.372863 0.578719
+vt 0.372317 0.613951
+vt 0.371666 0.613734
+vt 0.372221 0.578991
+vt 0.315877 0.640082
+vt 0.292344 0.614764
+vt 0.292986 0.614492
+vt 0.316131 0.639438
+vt 0.315346 0.553400
+vt 0.349331 0.553400
+vt 0.349077 0.554044
+vt 0.315664 0.554020
+vt 0.349861 0.640082
+vt 0.349543 0.639462
+vt 0.292889 0.579531
+vt 0.293541 0.579748
+vt 0.444102 0.636706
+vt 0.409596 0.636706
+vt 0.385196 0.612306
+vt 0.385196 0.577799
+vt 0.409596 0.553400
+vt 0.444102 0.553400
+vt 0.468502 0.577800
+vt 0.468502 0.612306
+vt 0.037160 1.987962
+vt 0.036793 0.000397
+vt 0.071486 0.000384
+vt 0.071853 1.987948
+vt 0.002468 1.987974
+vt 0.002100 0.000409
+vt 0.106546 1.987936
+vt 0.106179 0.000371
+vt 0.140872 0.000358
+vt 0.141239 1.987923
+vt 0.245318 1.987885
+vt 0.244951 0.000319
+vt 0.279643 0.000307
+vt 0.280011 1.987871
+vt 0.175932 1.987910
+vt 0.175565 0.000345
+vt 0.210258 0.000332
+vt 0.210625 1.987897
+vt 0.812500 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.937500
+vt 0.000000 0.875000
+vt 0.812500 0.875000
+vt 0.812500 0.937500
+vt 0.000000 0.812500
+vt 0.812500 0.812500
+vt 0.000000 0.750000
+vt 0.812500 0.750000
+vt 0.000000 0.687500
+vt 0.812500 0.687500
+vt 0.000000 0.625000
+vt 0.812500 0.625000
+vt 0.000000 0.562500
+vt 0.812500 0.562500
+vt 0.000000 0.500000
+vt 0.812500 0.500000
+vt 0.000000 0.437500
+vt 0.812500 0.437500
+vt 0.000000 0.375000
+vt 0.812500 0.375000
+vt 0.812500 1.000000
+vt 0.000000 0.937500
+vt 0.812500 0.937500
+vn 0.8268 0.3827 0.4122
+vn 0.4122 0.3826 -0.8269
+vn -0.8268 0.3827 -0.4123
+vn -0.4122 0.3827 0.8268
+vn 0.6328 -0.7071 0.3155
+vn -0.6328 -0.7071 -0.3155
+vn -0.8949 -0.0000 -0.4462
+vn 0.8949 -0.0000 0.4462
+vn -0.4462 -0.0000 0.8949
+vn 0.0000 0.0000 1.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.6561 0.0000 0.7547
+vn -0.0698 -0.0000 0.9976
+vn 0.7547 0.0000 -0.6561
+vn 0.9976 0.0000 0.0698
+vn -0.7547 -0.0000 0.6561
+vn -0.6561 -0.0000 -0.7547
+vn -0.9976 -0.0000 -0.0698
+vn 0.0698 -0.0000 -0.9976
+vn -0.1830 0.8351 -0.5188
+vn 0.4462 0.0000 -0.8949
+vn 0.3155 0.7071 -0.6328
+g Cube.001_Cube.001_Default_OBJ
+usemtl Default_OBJ
+s off
+f 1/1/1 2/2/2 3/3/3 4/4/4
+f 8/5/5 7/6/6 6/7/6 5/8/5
+f 4/9/7 3/3/7 42/10/7 43/11/7 44/12/7 45/13/7 46/14/7 47/15/7 48/16/7 49/17/7 50/18/7 8/19/7 5/20/7
+f 34/21/8 33/22/8 2/2/8 1/1/8 6/7/8 7/6/8 41/23/8 40/24/8 39/25/8 38/26/8 37/27/8 36/28/8 35/29/8
+f 1/1/9 4/4/9 5/30/9 6/7/9
+s 1
+f 9/31/10 10/32/10 11/33/10 12/34/10
+f 13/35/10 14/36/10 15/37/10 16/38/10
+f 17/39/10 18/40/10 19/41/10 20/42/10
+f 10/32/10 21/43/10 22/44/10 11/33/10
+f 14/36/10 23/45/10 24/46/10 15/37/10
+f 18/40/10 9/31/10 12/34/10 19/41/10
+f 21/47/11 13/48/11 14/49/11 23/50/11 17/51/11 18/52/11 9/53/11 10/54/11
+f 20/55/12 25/56/12 26/57/12 19/58/12
+f 21/43/10 13/35/10 16/38/10 22/44/10
+f 23/45/10 17/39/10 20/42/10 24/46/10
+f 24/59/13 27/60/13 25/56/13 20/55/13
+f 12/61/14 28/62/14 29/63/14 11/64/14
+f 19/58/15 26/57/15 28/62/15 12/61/15
+f 15/65/16 30/66/16 27/67/16 24/68/16
+f 22/69/17 31/70/17 32/71/17 16/72/17
+f 16/72/18 32/71/18 30/66/18 15/65/18
+f 11/64/19 29/63/19 31/70/19 22/69/19
+g Cube.001_Cube.001_Anzeige
+usemtl Anzeige
+s off
+f 3/73/20 2/74/21 33/75/21
+f 34/76/21 42/77/21 3/78/21 33/75/21
+f 35/79/21 43/80/21 42/77/21 34/76/21
+f 36/81/21 44/82/21 43/80/21 35/79/21
+f 37/83/21 45/84/21 44/82/21 36/81/21
+f 38/85/21 46/86/21 45/84/21 37/83/21
+f 39/87/21 47/88/21 46/86/21 38/85/21
+f 40/89/21 48/90/21 47/88/21 39/87/21
+f 41/91/21 49/92/21 48/90/21 40/89/21
+f 7/93/21 50/94/21 49/92/21 41/91/21
+f 50/95/21 7/96/21 8/97/22
diff --git a/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne3_smr45.obj b/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne3_smr45.obj
new file mode 100644
index 0000000..ed1047b
--- /dev/null
+++ b/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne3_smr45.obj
@@ -0,0 +1,213 @@
+# Blender v3.0.0 OBJ File: ''
+# www.blender.org
+mtllib advtrains_signals_ks_sign_ne3_smr45.mtl
+o Cube.001
+v 0.300197 1.200000 -0.158776
+v 0.314339 1.200000 -0.172918
+v 0.172918 1.200000 -0.314339
+v 0.158776 1.200000 -0.300197
+v 0.158776 0.700000 -0.300197
+v 0.300197 0.700000 -0.158776
+v 0.314339 0.700000 -0.172918
+v 0.172918 0.700000 -0.314339
+v 0.247016 1.055075 -0.211936
+v 0.236741 1.055075 -0.236741
+v 0.236741 1.055075 -0.236741
+v 0.247016 1.055075 -0.211936
+v 0.187132 1.055075 -0.236741
+v 0.176857 1.055075 -0.211936
+v 0.176857 1.055075 -0.211936
+v 0.187132 1.055075 -0.236741
+v 0.211936 1.055075 -0.176857
+v 0.236741 1.055075 -0.187132
+v 0.236741 1.055075 -0.187132
+v 0.211936 1.055075 -0.176857
+v 0.211936 1.055075 -0.247016
+v 0.211936 1.055075 -0.247016
+v 0.187132 1.055075 -0.187132
+v 0.187132 1.055075 -0.187132
+v 0.211936 -0.499729 -0.176857
+v 0.236741 -0.499729 -0.187131
+v 0.187132 -0.499729 -0.187132
+v 0.247016 -0.499729 -0.211936
+v 0.236741 -0.499729 -0.236741
+v 0.176857 -0.499729 -0.211935
+v 0.211937 -0.499729 -0.247015
+v 0.187132 -0.499729 -0.236741
+v 0.314339 1.150000 -0.172918
+v 0.314339 1.100000 -0.172918
+v 0.314339 1.050000 -0.172918
+v 0.314339 1.000000 -0.172918
+v 0.314339 0.950000 -0.172918
+v 0.314339 0.900000 -0.172918
+v 0.314339 0.850000 -0.172918
+v 0.314339 0.800000 -0.172918
+v 0.314339 0.750000 -0.172918
+v 0.172918 1.150000 -0.314339
+v 0.172918 1.100000 -0.314339
+v 0.172918 1.050000 -0.314339
+v 0.172918 1.000000 -0.314339
+v 0.172918 0.950000 -0.314339
+v 0.172918 0.900000 -0.314339
+v 0.172918 0.850000 -0.314339
+v 0.172918 0.800000 -0.314339
+v 0.172918 0.750000 -0.314339
+vt 0.583333 0.750000
+vt 0.583333 0.500000
+vt 0.583333 0.250000
+vt 0.583333 1.000000
+vt 0.125000 0.500000
+vt 0.375000 0.500000
+vt 0.375000 0.750000
+vt 0.125000 0.750000
+vt 0.583333 0.000000
+vt 0.562500 0.250000
+vt 0.541666 0.250000
+vt 0.520833 0.250000
+vt 0.500000 0.250000
+vt 0.479166 0.250000
+vt 0.458333 0.250000
+vt 0.437500 0.250000
+vt 0.416667 0.250000
+vt 0.395833 0.250000
+vt 0.375000 0.250000
+vt 0.375000 0.000000
+vt 0.541666 0.500000
+vt 0.562500 0.500000
+vt 0.395833 0.500000
+vt 0.416667 0.500000
+vt 0.437500 0.500000
+vt 0.458333 0.500000
+vt 0.479166 0.500000
+vt 0.500000 0.500000
+vt 0.520833 0.500000
+vt 0.375000 1.000000
+vt 0.372863 0.578719
+vt 0.372317 0.613951
+vt 0.371666 0.613734
+vt 0.372221 0.578991
+vt 0.315877 0.640082
+vt 0.292344 0.614764
+vt 0.292986 0.614492
+vt 0.316131 0.639438
+vt 0.315346 0.553400
+vt 0.349331 0.553400
+vt 0.349077 0.554044
+vt 0.315664 0.554020
+vt 0.349861 0.640082
+vt 0.349543 0.639462
+vt 0.292889 0.579531
+vt 0.293541 0.579748
+vt 0.444102 0.636706
+vt 0.409596 0.636706
+vt 0.385196 0.612306
+vt 0.385196 0.577799
+vt 0.409596 0.553400
+vt 0.444102 0.553400
+vt 0.468502 0.577800
+vt 0.468502 0.612306
+vt 0.037160 1.987962
+vt 0.036793 0.000397
+vt 0.071486 0.000384
+vt 0.071853 1.987948
+vt 0.002468 1.987974
+vt 0.002100 0.000409
+vt 0.106546 1.987936
+vt 0.106179 0.000371
+vt 0.140872 0.000358
+vt 0.141239 1.987923
+vt 0.245318 1.987885
+vt 0.244951 0.000319
+vt 0.279643 0.000307
+vt 0.280011 1.987871
+vt 0.175932 1.987910
+vt 0.175565 0.000345
+vt 0.210258 0.000332
+vt 0.210625 1.987897
+vt 0.812500 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.937500
+vt 0.000000 0.875000
+vt 0.812500 0.875000
+vt 0.812500 0.937500
+vt 0.000000 0.812500
+vt 0.812500 0.812500
+vt 0.000000 0.750000
+vt 0.812500 0.750000
+vt 0.000000 0.687500
+vt 0.812500 0.687500
+vt 0.000000 0.625000
+vt 0.812500 0.625000
+vt 0.000000 0.562500
+vt 0.812500 0.562500
+vt 0.000000 0.500000
+vt 0.812500 0.500000
+vt 0.000000 0.437500
+vt 0.812500 0.437500
+vt 0.000000 0.375000
+vt 0.812500 0.375000
+vt 0.812500 1.000000
+vt 0.000000 0.937500
+vt 0.812500 0.937500
+vn 0.6533 0.3827 0.6532
+vn 0.6533 0.3826 -0.6533
+vn -0.6532 0.3827 -0.6533
+vn -0.6532 0.3827 0.6533
+vn 0.5000 -0.7071 0.5000
+vn -0.5000 -0.7071 -0.5000
+vn -0.7071 0.0000 -0.7071
+vn 0.7071 0.0000 0.7071
+vn -0.7071 -0.0000 0.7071
+vn 0.0000 0.0000 1.0000
+vn 0.0000 1.0000 -0.0000
+vn 0.3827 0.0000 0.9239
+vn -0.3827 -0.0000 0.9239
+vn 0.9239 0.0000 -0.3827
+vn 0.9239 0.0000 0.3827
+vn -0.9239 -0.0000 0.3827
+vn -0.3827 -0.0000 -0.9239
+vn -0.9239 -0.0000 -0.3827
+vn 0.3827 -0.0000 -0.9239
+vn -0.0089 0.8351 -0.5501
+vn 0.7071 0.0000 -0.7071
+vn 0.5000 0.7071 -0.5000
+g Cube.001_Cube.001_Default_OBJ
+usemtl Default_OBJ
+s off
+f 1/1/1 2/2/2 3/3/3 4/4/4
+f 8/5/5 7/6/6 6/7/6 5/8/5
+f 4/9/7 3/3/7 42/10/7 43/11/7 44/12/7 45/13/7 46/14/7 47/15/7 48/16/7 49/17/7 50/18/7 8/19/7 5/20/7
+f 34/21/8 33/22/8 2/2/8 1/1/8 6/7/8 7/6/8 41/23/8 40/24/8 39/25/8 38/26/8 37/27/8 36/28/8 35/29/8
+f 1/1/9 4/4/9 5/30/9 6/7/9
+s 1
+f 9/31/10 10/32/10 11/33/10 12/34/10
+f 13/35/10 14/36/10 15/37/10 16/38/10
+f 17/39/10 18/40/10 19/41/10 20/42/10
+f 10/32/10 21/43/10 22/44/10 11/33/10
+f 14/36/10 23/45/10 24/46/10 15/37/10
+f 18/40/10 9/31/10 12/34/10 19/41/10
+f 21/47/11 13/48/11 14/49/11 23/50/11 17/51/11 18/52/11 9/53/11 10/54/11
+f 20/55/12 25/56/12 26/57/12 19/58/12
+f 21/43/10 13/35/10 16/38/10 22/44/10
+f 23/45/10 17/39/10 20/42/10 24/46/10
+f 24/59/13 27/60/13 25/56/13 20/55/13
+f 12/61/14 28/62/14 29/63/14 11/64/14
+f 19/58/15 26/57/15 28/62/15 12/61/15
+f 15/65/16 30/66/16 27/67/16 24/68/16
+f 22/69/17 31/70/17 32/71/17 16/72/17
+f 16/72/18 32/71/18 30/66/18 15/65/18
+f 11/64/19 29/63/19 31/70/19 22/69/19
+g Cube.001_Cube.001_Anzeige
+usemtl Anzeige
+s off
+f 3/73/20 2/74/21 33/75/21
+f 34/76/21 42/77/21 3/78/21 33/75/21
+f 35/79/21 43/80/21 42/77/21 34/76/21
+f 36/81/21 44/82/21 43/80/21 35/79/21
+f 37/83/21 45/84/21 44/82/21 36/81/21
+f 38/85/21 46/86/21 45/84/21 37/83/21
+f 39/87/21 47/88/21 46/86/21 38/85/21
+f 40/89/21 48/90/21 47/88/21 39/87/21
+f 41/91/21 49/92/21 48/90/21 40/89/21
+f 7/93/21 50/94/21 49/92/21 41/91/21
+f 50/95/21 7/96/21 8/97/22
diff --git a/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne3_smr60.obj b/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne3_smr60.obj
new file mode 100644
index 0000000..0a28ff1
--- /dev/null
+++ b/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne3_smr60.obj
@@ -0,0 +1,213 @@
+# Blender v3.0.0 OBJ File: ''
+# www.blender.org
+mtllib advtrains_signals_ks_sign_ne3_smr60.mtl
+o Cube.001
+v 0.335064 1.200000 -0.055317
+v 0.352963 1.200000 -0.064241
+v 0.263724 1.200000 -0.243228
+v 0.245825 1.200000 -0.234304
+v 0.245825 0.700000 -0.234304
+v 0.335064 0.700000 -0.055317
+v 0.352963 0.700000 -0.064241
+v 0.263724 0.700000 -0.243228
+v 0.301499 1.055075 -0.122605
+v 0.299626 1.055075 -0.149388
+v 0.299626 1.055075 -0.149388
+v 0.301499 1.055075 -0.122605
+v 0.252580 1.055075 -0.165129
+v 0.234966 1.055075 -0.144867
+v 0.234966 1.055075 -0.144867
+v 0.252580 1.055075 -0.165129
+v 0.257101 1.055075 -0.100469
+v 0.283885 1.055075 -0.102342
+v 0.283885 1.055075 -0.102342
+v 0.257101 1.055075 -0.100469
+v 0.279363 1.055075 -0.167002
+v 0.279363 1.055075 -0.167002
+v 0.236839 1.055075 -0.118084
+v 0.236839 1.055075 -0.118084
+v 0.257102 -0.499729 -0.100469
+v 0.283885 -0.499729 -0.102341
+v 0.236839 -0.499729 -0.118084
+v 0.301499 -0.499729 -0.122605
+v 0.299626 -0.499729 -0.149388
+v 0.234966 -0.499729 -0.144866
+v 0.279364 -0.499729 -0.167002
+v 0.252580 -0.499729 -0.165129
+v 0.352963 1.150000 -0.064241
+v 0.352963 1.100000 -0.064241
+v 0.352963 1.050000 -0.064241
+v 0.352963 1.000000 -0.064241
+v 0.352963 0.950000 -0.064241
+v 0.352963 0.900000 -0.064241
+v 0.352963 0.850000 -0.064241
+v 0.352963 0.800000 -0.064241
+v 0.352963 0.750000 -0.064241
+v 0.263724 1.150000 -0.243228
+v 0.263724 1.100000 -0.243228
+v 0.263724 1.050000 -0.243228
+v 0.263724 1.000000 -0.243228
+v 0.263724 0.950000 -0.243228
+v 0.263724 0.900000 -0.243228
+v 0.263724 0.850000 -0.243228
+v 0.263724 0.800000 -0.243228
+v 0.263724 0.750000 -0.243228
+vt 0.583333 0.750000
+vt 0.583333 0.500000
+vt 0.583333 0.250000
+vt 0.583333 1.000000
+vt 0.125000 0.500000
+vt 0.375000 0.500000
+vt 0.375000 0.750000
+vt 0.125000 0.750000
+vt 0.583333 0.000000
+vt 0.562500 0.250000
+vt 0.541666 0.250000
+vt 0.520833 0.250000
+vt 0.500000 0.250000
+vt 0.479166 0.250000
+vt 0.458333 0.250000
+vt 0.437500 0.250000
+vt 0.416667 0.250000
+vt 0.395833 0.250000
+vt 0.375000 0.250000
+vt 0.375000 0.000000
+vt 0.541666 0.500000
+vt 0.562500 0.500000
+vt 0.395833 0.500000
+vt 0.416667 0.500000
+vt 0.437500 0.500000
+vt 0.458333 0.500000
+vt 0.479166 0.500000
+vt 0.500000 0.500000
+vt 0.520833 0.500000
+vt 0.375000 1.000000
+vt 0.372863 0.578719
+vt 0.372317 0.613951
+vt 0.371666 0.613734
+vt 0.372221 0.578991
+vt 0.315877 0.640082
+vt 0.292344 0.614764
+vt 0.292986 0.614492
+vt 0.316131 0.639438
+vt 0.315346 0.553400
+vt 0.349331 0.553400
+vt 0.349077 0.554044
+vt 0.315664 0.554020
+vt 0.349861 0.640082
+vt 0.349543 0.639462
+vt 0.292889 0.579531
+vt 0.293541 0.579748
+vt 0.444102 0.636706
+vt 0.409596 0.636706
+vt 0.385196 0.612306
+vt 0.385196 0.577799
+vt 0.409596 0.553400
+vt 0.444102 0.553400
+vt 0.468502 0.577800
+vt 0.468502 0.612306
+vt 0.037160 1.987962
+vt 0.036793 0.000397
+vt 0.071486 0.000384
+vt 0.071853 1.987948
+vt 0.002468 1.987974
+vt 0.002100 0.000409
+vt 0.106546 1.987936
+vt 0.106179 0.000371
+vt 0.140872 0.000358
+vt 0.141239 1.987923
+vt 0.245318 1.987885
+vt 0.244951 0.000319
+vt 0.279643 0.000307
+vt 0.280011 1.987871
+vt 0.175932 1.987910
+vt 0.175565 0.000345
+vt 0.210258 0.000332
+vt 0.210625 1.987897
+vt 0.812500 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.937500
+vt 0.000000 0.875000
+vt 0.812500 0.875000
+vt 0.812500 0.937500
+vt 0.000000 0.812500
+vt 0.812500 0.812500
+vt 0.000000 0.750000
+vt 0.812500 0.750000
+vt 0.000000 0.687500
+vt 0.812500 0.687500
+vt 0.000000 0.625000
+vt 0.812500 0.625000
+vt 0.000000 0.562500
+vt 0.812500 0.562500
+vt 0.000000 0.500000
+vt 0.812500 0.500000
+vt 0.000000 0.437500
+vt 0.812500 0.437500
+vt 0.000000 0.375000
+vt 0.812500 0.375000
+vt 0.812500 1.000000
+vt 0.000000 0.937500
+vt 0.812500 0.937500
+vn 0.4123 0.3827 0.8268
+vn 0.8268 0.3826 -0.4123
+vn -0.4122 0.3827 -0.8268
+vn -0.8268 0.3827 0.4123
+vn 0.3155 -0.7071 0.6328
+vn -0.3155 -0.7071 -0.6328
+vn -0.4462 0.0000 -0.8949
+vn 0.4462 0.0000 0.8949
+vn -0.8949 -0.0000 0.4462
+vn 0.0000 0.0000 1.0000
+vn 0.0000 1.0000 0.0000
+vn 0.0698 0.0000 0.9976
+vn -0.6561 -0.0000 0.7547
+vn 0.9976 0.0000 -0.0698
+vn 0.7547 0.0000 0.6561
+vn -0.9976 -0.0000 0.0698
+vn -0.0698 -0.0000 -0.9976
+vn -0.7547 -0.0000 -0.6561
+vn 0.6561 -0.0000 -0.7547
+vn 0.1661 0.8351 -0.5245
+vn 0.8949 0.0000 -0.4462
+vn 0.6328 0.7071 -0.3155
+g Cube.001_Cube.001_Default_OBJ
+usemtl Default_OBJ
+s off
+f 1/1/1 2/2/2 3/3/3 4/4/4
+f 8/5/5 7/6/6 6/7/6 5/8/5
+f 4/9/7 3/3/7 42/10/7 43/11/7 44/12/7 45/13/7 46/14/7 47/15/7 48/16/7 49/17/7 50/18/7 8/19/7 5/20/7
+f 34/21/8 33/22/8 2/2/8 1/1/8 6/7/8 7/6/8 41/23/8 40/24/8 39/25/8 38/26/8 37/27/8 36/28/8 35/29/8
+f 1/1/9 4/4/9 5/30/9 6/7/9
+s 1
+f 9/31/10 10/32/10 11/33/10 12/34/10
+f 13/35/10 14/36/10 15/37/10 16/38/10
+f 17/39/10 18/40/10 19/41/10 20/42/10
+f 10/32/10 21/43/10 22/44/10 11/33/10
+f 14/36/10 23/45/10 24/46/10 15/37/10
+f 18/40/10 9/31/10 12/34/10 19/41/10
+f 21/47/11 13/48/11 14/49/11 23/50/11 17/51/11 18/52/11 9/53/11 10/54/11
+f 20/55/12 25/56/12 26/57/12 19/58/12
+f 21/43/10 13/35/10 16/38/10 22/44/10
+f 23/45/10 17/39/10 20/42/10 24/46/10
+f 24/59/13 27/60/13 25/56/13 20/55/13
+f 12/61/14 28/62/14 29/63/14 11/64/14
+f 19/58/15 26/57/15 28/62/15 12/61/15
+f 15/65/16 30/66/16 27/67/16 24/68/16
+f 22/69/17 31/70/17 32/71/17 16/72/17
+f 16/72/18 32/71/18 30/66/18 15/65/18
+f 11/64/19 29/63/19 31/70/19 22/69/19
+g Cube.001_Cube.001_Anzeige
+usemtl Anzeige
+s off
+f 3/73/20 2/74/21 33/75/21
+f 34/76/21 42/77/21 3/78/21 33/75/21
+f 35/79/21 43/80/21 42/77/21 34/76/21
+f 36/81/21 44/82/21 43/80/21 35/79/21
+f 37/83/21 45/84/21 44/82/21 36/81/21
+f 38/85/21 46/86/21 45/84/21 37/83/21
+f 39/87/21 47/88/21 46/86/21 38/85/21
+f 40/89/21 48/90/21 47/88/21 39/87/21
+f 41/91/21 49/92/21 48/90/21 40/89/21
+f 7/93/21 50/94/21 49/92/21 41/91/21
+f 50/95/21 7/96/21 8/97/22
diff --git a/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne4_smr0.obj b/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne4_smr0.obj
new file mode 100644
index 0000000..3c4fa17
--- /dev/null
+++ b/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne4_smr0.obj
@@ -0,0 +1,148 @@
+# Blender v3.0.0 OBJ File: ''
+# www.blender.org
+mtllib advtrains_signals_ks_sign_ne4_smr0.mtl
+o Cube.001
+v 0.100000 1.200000 -0.324543
+v 0.100000 1.200000 -0.344543
+v -0.100000 1.200000 -0.344543
+v -0.100000 1.200000 -0.324543
+v 0.100000 0.700000 -0.344543
+v 0.100000 0.700000 -0.324543
+v -0.100000 0.700000 -0.344543
+v -0.100000 0.700000 -0.324543
+v 0.024805 1.055075 -0.324528
+v 0.000000 1.055075 -0.334802
+v 0.000000 1.055075 -0.334802
+v 0.024805 1.055075 -0.324528
+v -0.035079 1.055075 -0.299723
+v -0.024805 1.055075 -0.274918
+v -0.024805 1.055075 -0.274918
+v -0.035079 1.055075 -0.299723
+v 0.024805 1.055075 -0.274918
+v 0.035079 1.055075 -0.299723
+v 0.035079 1.055075 -0.299723
+v 0.024805 1.055075 -0.274918
+v -0.024805 1.055075 -0.324528
+v -0.024805 1.055075 -0.324528
+v 0.000000 1.055075 -0.264644
+v 0.000000 1.055075 -0.264644
+v 0.024805 -0.499729 -0.274918
+v 0.035080 -0.499729 -0.299723
+v 0.000000 -0.499729 -0.264644
+v 0.024805 -0.499729 -0.324528
+v 0.000000 -0.499729 -0.334802
+v -0.024804 -0.499729 -0.274918
+v -0.024804 -0.499729 -0.324528
+v -0.035079 -0.499729 -0.299723
+vt 0.583333 0.750000
+vt 0.583333 0.500000
+vt 0.583333 0.250000
+vt 0.583333 1.000000
+vt 0.375000 1.000000
+vt 0.375000 0.750000
+vt 0.375000 0.500000
+vt 0.375000 0.000000
+vt 0.583333 0.000000
+vt 0.375000 0.250000
+vt 0.125000 0.500000
+vt 0.125000 0.750000
+vt 0.372863 0.578719
+vt 0.372317 0.613951
+vt 0.371666 0.613734
+vt 0.372221 0.578991
+vt 0.315877 0.640082
+vt 0.292344 0.614764
+vt 0.292986 0.614492
+vt 0.316131 0.639438
+vt 0.315346 0.553400
+vt 0.349331 0.553400
+vt 0.349077 0.554044
+vt 0.315664 0.554020
+vt 0.349861 0.640082
+vt 0.349543 0.639462
+vt 0.292889 0.579531
+vt 0.293541 0.579748
+vt 0.444102 0.636706
+vt 0.409596 0.636706
+vt 0.385196 0.612306
+vt 0.385196 0.577799
+vt 0.409596 0.553400
+vt 0.444102 0.553400
+vt 0.468502 0.577800
+vt 0.468502 0.612306
+vt 0.037160 1.987962
+vt 0.036793 0.000397
+vt 0.071486 0.000384
+vt 0.071853 1.987948
+vt 0.002468 1.987974
+vt 0.002100 0.000409
+vt 0.106546 1.987936
+vt 0.106179 0.000371
+vt 0.140872 0.000358
+vt 0.141239 1.987923
+vt 0.245318 1.987885
+vt 0.244951 0.000319
+vt 0.279643 0.000307
+vt 0.280011 1.987871
+vt 0.175932 1.987910
+vt 0.175565 0.000345
+vt 0.210258 0.000332
+vt 0.210625 1.987897
+vt 0.250000 0.375000
+vt 0.250000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.375000
+vn 0.9239 0.3827 -0.0000
+vn -0.0000 0.3826 -0.9239
+vn -0.9239 0.3827 -0.0001
+vn 0.0000 0.3827 0.9239
+vn 0.0000 -0.0000 1.0000
+vn 1.0000 -0.0000 0.0000
+vn -1.0000 0.0000 0.0000
+vn 0.7071 -0.7071 0.0000
+vn -0.7071 -0.7071 -0.0000
+vn -0.9659 0.0000 0.2588
+vn 0.9659 0.0000 0.2588
+vn -0.7814 -0.5678 0.2588
+vn 0.9659 0.0000 -0.2588
+vn -0.9659 0.0000 -0.2588
+vn 0.0000 1.0000 0.0000
+vn 0.9239 0.0000 0.3827
+vn 0.3827 -0.0000 0.9239
+vn 0.3827 0.0000 -0.9239
+vn 0.9239 0.0000 -0.3827
+vn -0.3827 -0.0000 0.9239
+vn -0.9239 -0.0000 -0.3827
+vn -0.9239 -0.0000 0.3827
+vn -0.3827 -0.0000 -0.9239
+vn 0.0000 0.0000 -1.0000
+g Cube.001_Cube.001_Default_OBJ
+usemtl Default_OBJ
+s off
+f 1/1/1 2/2/2 3/3/3 4/4/4
+f 1/1/5 4/4/5 8/5/5 6/6/5
+f 5/7/6 2/2/6 1/1/6 6/6/6
+f 8/8/7 4/9/7 3/3/7 7/10/7
+f 7/11/8 5/7/9 6/6/9 8/12/8
+s 1
+f 9/13/10 10/14/5 11/15/11 12/16/12
+f 13/17/6 14/18/13 15/19/14 16/20/6
+f 17/21/13 18/22/7 19/23/7 20/24/14
+f 10/14/5 21/25/10 22/26/11 11/15/11
+f 14/18/13 23/27/5 24/28/14 15/19/14
+f 18/22/7 9/13/10 12/16/12 19/23/7
+f 21/29/15 13/30/15 14/31/15 23/32/15 17/33/15 18/34/15 9/35/15 10/36/15
+f 20/37/16 25/38/16 26/39/16 19/40/16
+f 21/25/10 13/17/6 16/20/6 22/26/11
+f 23/27/5 17/21/13 20/24/14 24/28/14
+f 24/41/17 27/42/17 25/38/17 20/37/17
+f 12/43/18 28/44/18 29/45/18 11/46/18
+f 19/40/19 26/39/19 28/44/19 12/43/19
+f 15/47/20 30/48/20 27/49/20 24/50/20
+f 22/51/21 31/52/21 32/53/21 16/54/21
+f 16/54/22 32/53/22 30/48/22 15/47/22
+f 11/46/23 29/45/23 31/52/23 22/51/23
+g Cube.001_Cube.001_Anzeige
+usemtl Anzeige
+s off
+f 7/55/24 3/56/24 2/57/24 5/58/24
diff --git a/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne4_smr30.obj b/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne4_smr30.obj
new file mode 100644
index 0000000..d6f8603
--- /dev/null
+++ b/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne4_smr30.obj
@@ -0,0 +1,151 @@
+# Blender v3.0.0 OBJ File: ''
+# www.blender.org
+mtllib advtrains_signals_ks_sign_ne4_smr30.mtl
+o Cube.001
+v 0.234304 1.200000 -0.245825
+v 0.243228 1.200000 -0.263724
+v 0.064241 1.200000 -0.352963
+v 0.055317 1.200000 -0.335064
+v 0.243228 0.700000 -0.263724
+v 0.234304 0.700000 -0.245825
+v 0.064241 0.700000 -0.352963
+v 0.055317 0.700000 -0.335064
+v 0.167003 1.055075 -0.279363
+v 0.149388 1.055075 -0.299626
+v 0.149388 1.055075 -0.299626
+v 0.167003 1.055075 -0.279363
+v 0.102342 1.055075 -0.283885
+v 0.100469 1.055075 -0.257101
+v 0.100469 1.055075 -0.257101
+v 0.102342 1.055075 -0.283885
+v 0.144867 1.055075 -0.234966
+v 0.165129 1.055075 -0.252580
+v 0.165129 1.055075 -0.252580
+v 0.144867 1.055075 -0.234966
+v 0.122605 1.055075 -0.301499
+v 0.122605 1.055075 -0.301499
+v 0.118084 1.055075 -0.236839
+v 0.118084 1.055075 -0.236839
+v 0.144867 -0.499729 -0.234966
+v 0.165130 -0.499729 -0.252580
+v 0.118084 -0.499729 -0.236839
+v 0.167003 -0.499729 -0.279363
+v 0.149388 -0.499729 -0.299626
+v 0.100470 -0.499729 -0.257101
+v 0.122606 -0.499729 -0.301499
+v 0.102342 -0.499729 -0.283885
+vt 0.583333 0.750000
+vt 0.583333 0.500000
+vt 0.583333 0.250000
+vt 0.583333 1.000000
+vt 0.375000 1.000000
+vt 0.375000 0.750000
+vt 0.375000 0.500000
+vt 0.375000 0.000000
+vt 0.583333 0.000000
+vt 0.375000 0.250000
+vt 0.125000 0.500000
+vt 0.125000 0.750000
+vt 0.372863 0.578719
+vt 0.372317 0.613951
+vt 0.371666 0.613734
+vt 0.372221 0.578991
+vt 0.315877 0.640082
+vt 0.292344 0.614764
+vt 0.292986 0.614492
+vt 0.316131 0.639438
+vt 0.315346 0.553400
+vt 0.349331 0.553400
+vt 0.349077 0.554044
+vt 0.315664 0.554020
+vt 0.349861 0.640082
+vt 0.349543 0.639462
+vt 0.292889 0.579531
+vt 0.293541 0.579748
+vt 0.444102 0.636706
+vt 0.409596 0.636706
+vt 0.385196 0.612306
+vt 0.385196 0.577799
+vt 0.409596 0.553400
+vt 0.444102 0.553400
+vt 0.468502 0.577800
+vt 0.468502 0.612306
+vt 0.037160 1.987962
+vt 0.036793 0.000397
+vt 0.071486 0.000384
+vt 0.071853 1.987948
+vt 0.002468 1.987974
+vt 0.002100 0.000409
+vt 0.106546 1.987936
+vt 0.106179 0.000371
+vt 0.140872 0.000358
+vt 0.141239 1.987923
+vt 0.245318 1.987885
+vt 0.244951 0.000319
+vt 0.279643 0.000307
+vt 0.280011 1.987871
+vt 0.175932 1.987910
+vt 0.175565 0.000345
+vt 0.210258 0.000332
+vt 0.210625 1.987897
+vt 0.250000 0.375000
+vt 0.250000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.375000
+vn 0.8268 0.3827 0.4122
+vn 0.4122 0.3826 -0.8269
+vn -0.8268 0.3827 -0.4123
+vn -0.4122 0.3826 0.8268
+vn -0.4462 -0.0000 0.8949
+vn 0.8949 -0.0000 0.4462
+vn -0.8949 -0.0000 -0.4462
+vn 0.6328 -0.7071 0.3155
+vn -0.6328 -0.7071 -0.3155
+vn -0.9769 0.0000 0.2136
+vn 0.0000 0.0000 1.0000
+vn 0.9659 0.0000 0.2588
+vn -0.9659 0.0000 0.2588
+vn 0.9769 0.0000 -0.2136
+vn -0.7815 -0.5677 0.2588
+vn 0.9659 0.0000 -0.2588
+vn -0.9659 0.0000 -0.2588
+vn 0.0000 1.0000 -0.0000
+vn 0.6561 0.0000 0.7547
+vn -0.0698 -0.0000 0.9976
+vn 0.7547 0.0000 -0.6561
+vn 0.9976 0.0000 0.0698
+vn -0.7547 -0.0000 0.6561
+vn -0.6561 -0.0000 -0.7547
+vn -0.9976 -0.0000 -0.0698
+vn 0.0698 -0.0000 -0.9976
+vn 0.4462 0.0000 -0.8949
+g Cube.001_Cube.001_Default_OBJ
+usemtl Default_OBJ
+s off
+f 1/1/1 2/2/2 3/3/3 4/4/4
+f 1/1/5 4/4/5 8/5/5 6/6/5
+f 5/7/6 2/2/6 1/1/6 6/6/6
+f 8/8/7 4/9/7 3/3/7 7/10/7
+f 7/11/8 5/7/9 6/6/9 8/12/8
+s 1
+f 9/13/10 10/14/11 11/15/12 12/16/10
+f 13/17/13 14/18/14 15/19/14 16/20/15
+f 17/21/16 18/22/16 19/23/17 20/24/17
+f 10/14/11 21/25/13 22/26/12 11/15/12
+f 14/18/14 23/27/11 24/28/17 15/19/14
+f 18/22/16 9/13/10 12/16/10 19/23/17
+f 21/29/18 13/30/18 14/31/18 23/32/18 17/33/18 18/34/18 9/35/18 10/36/18
+f 20/37/19 25/38/19 26/39/19 19/40/19
+f 21/25/13 13/17/13 16/20/15 22/26/12
+f 23/27/11 17/21/16 20/24/17 24/28/17
+f 24/41/20 27/42/20 25/38/20 20/37/20
+f 12/43/21 28/44/21 29/45/21 11/46/21
+f 19/40/22 26/39/22 28/44/22 12/43/22
+f 15/47/23 30/48/23 27/49/23 24/50/23
+f 22/51/24 31/52/24 32/53/24 16/54/24
+f 16/54/25 32/53/25 30/48/25 15/47/25
+f 11/46/26 29/45/26 31/52/26 22/51/26
+g Cube.001_Cube.001_Anzeige
+usemtl Anzeige
+s off
+f 7/55/27 3/56/27 2/57/27 5/58/27
diff --git a/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne4_smr45.obj b/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne4_smr45.obj
new file mode 100644
index 0000000..b2c828e
--- /dev/null
+++ b/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne4_smr45.obj
@@ -0,0 +1,151 @@
+# Blender v3.0.0 OBJ File: ''
+# www.blender.org
+mtllib advtrains_signals_ks_sign_ne4_smr45.mtl
+o Cube.001
+v 0.300197 1.200000 -0.158776
+v 0.314339 1.200000 -0.172918
+v 0.172918 1.200000 -0.314339
+v 0.158776 1.200000 -0.300197
+v 0.314339 0.700000 -0.172918
+v 0.300197 0.700000 -0.158776
+v 0.172918 0.700000 -0.314339
+v 0.158776 0.700000 -0.300197
+v 0.247016 1.055075 -0.211936
+v 0.236741 1.055075 -0.236741
+v 0.236741 1.055075 -0.236741
+v 0.247016 1.055075 -0.211936
+v 0.187132 1.055075 -0.236741
+v 0.176857 1.055075 -0.211936
+v 0.176857 1.055075 -0.211936
+v 0.187132 1.055075 -0.236741
+v 0.211936 1.055075 -0.176857
+v 0.236741 1.055075 -0.187132
+v 0.236741 1.055075 -0.187132
+v 0.211936 1.055075 -0.176857
+v 0.211936 1.055075 -0.247016
+v 0.211936 1.055075 -0.247016
+v 0.187132 1.055075 -0.187132
+v 0.187132 1.055075 -0.187132
+v 0.211936 -0.499729 -0.176857
+v 0.236741 -0.499729 -0.187131
+v 0.187132 -0.499729 -0.187132
+v 0.247016 -0.499729 -0.211936
+v 0.236741 -0.499729 -0.236741
+v 0.176857 -0.499729 -0.211935
+v 0.211937 -0.499729 -0.247015
+v 0.187132 -0.499729 -0.236741
+vt 0.583333 0.750000
+vt 0.583333 0.500000
+vt 0.583333 0.250000
+vt 0.583333 1.000000
+vt 0.375000 1.000000
+vt 0.375000 0.750000
+vt 0.375000 0.500000
+vt 0.375000 0.000000
+vt 0.583333 0.000000
+vt 0.375000 0.250000
+vt 0.125000 0.500000
+vt 0.125000 0.750000
+vt 0.372863 0.578719
+vt 0.372317 0.613951
+vt 0.371666 0.613734
+vt 0.372221 0.578991
+vt 0.315877 0.640082
+vt 0.292344 0.614764
+vt 0.292986 0.614492
+vt 0.316131 0.639438
+vt 0.315346 0.553400
+vt 0.349331 0.553400
+vt 0.349077 0.554044
+vt 0.315664 0.554020
+vt 0.349861 0.640082
+vt 0.349543 0.639462
+vt 0.292889 0.579531
+vt 0.293541 0.579748
+vt 0.444102 0.636706
+vt 0.409596 0.636706
+vt 0.385196 0.612306
+vt 0.385196 0.577799
+vt 0.409596 0.553400
+vt 0.444102 0.553400
+vt 0.468502 0.577800
+vt 0.468502 0.612306
+vt 0.037160 1.987962
+vt 0.036793 0.000397
+vt 0.071486 0.000384
+vt 0.071853 1.987948
+vt 0.002468 1.987974
+vt 0.002100 0.000409
+vt 0.106546 1.987936
+vt 0.106179 0.000371
+vt 0.140872 0.000358
+vt 0.141239 1.987923
+vt 0.245318 1.987885
+vt 0.244951 0.000319
+vt 0.279643 0.000307
+vt 0.280011 1.987871
+vt 0.175932 1.987910
+vt 0.175565 0.000345
+vt 0.210258 0.000332
+vt 0.210625 1.987897
+vt 0.250000 0.375000
+vt 0.250000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.375000
+vn 0.6533 0.3827 0.6532
+vn 0.6533 0.3826 -0.6533
+vn -0.6532 0.3826 -0.6534
+vn -0.6533 0.3827 0.6533
+vn -0.7071 -0.0000 0.7071
+vn 0.7071 -0.0000 0.7071
+vn -0.7071 0.0000 -0.7071
+vn 0.5000 -0.7071 0.5000
+vn -0.5000 -0.7071 -0.5000
+vn -1.0000 0.0000 -0.0000
+vn 0.0000 0.0000 1.0000
+vn 0.9659 0.0000 0.2588
+vn -0.9659 0.0000 0.2588
+vn 1.0000 0.0000 -0.0000
+vn -0.7815 -0.5677 0.2588
+vn 0.9659 0.0000 -0.2588
+vn -0.9659 0.0000 -0.2588
+vn 0.0000 1.0000 -0.0000
+vn 0.3827 0.0000 0.9239
+vn -0.3827 -0.0000 0.9239
+vn 0.9239 0.0000 -0.3827
+vn 0.9239 0.0000 0.3827
+vn -0.9239 -0.0000 0.3827
+vn -0.3827 -0.0000 -0.9239
+vn -0.9239 -0.0000 -0.3827
+vn 0.3827 -0.0000 -0.9239
+vn 0.7071 0.0000 -0.7071
+g Cube.001_Cube.001_Default_OBJ
+usemtl Default_OBJ
+s off
+f 1/1/1 2/2/2 3/3/3 4/4/4
+f 1/1/5 4/4/5 8/5/5 6/6/5
+f 5/7/6 2/2/6 1/1/6 6/6/6
+f 8/8/7 4/9/7 3/3/7 7/10/7
+f 7/11/8 5/7/9 6/6/9 8/12/8
+s 1
+f 9/13/10 10/14/11 11/15/12 12/16/10
+f 13/17/13 14/18/14 15/19/14 16/20/15
+f 17/21/16 18/22/16 19/23/17 20/24/17
+f 10/14/11 21/25/13 22/26/12 11/15/12
+f 14/18/14 23/27/11 24/28/17 15/19/14
+f 18/22/16 9/13/10 12/16/10 19/23/17
+f 21/29/18 13/30/18 14/31/18 23/32/18 17/33/18 18/34/18 9/35/18 10/36/18
+f 20/37/19 25/38/19 26/39/19 19/40/19
+f 21/25/13 13/17/13 16/20/15 22/26/12
+f 23/27/11 17/21/16 20/24/17 24/28/17
+f 24/41/20 27/42/20 25/38/20 20/37/20
+f 12/43/21 28/44/21 29/45/21 11/46/21
+f 19/40/22 26/39/22 28/44/22 12/43/22
+f 15/47/23 30/48/23 27/49/23 24/50/23
+f 22/51/24 31/52/24 32/53/24 16/54/24
+f 16/54/25 32/53/25 30/48/25 15/47/25
+f 11/46/26 29/45/26 31/52/26 22/51/26
+g Cube.001_Cube.001_Anzeige
+usemtl Anzeige
+s off
+f 7/55/27 3/56/27 2/57/27 5/58/27
diff --git a/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne4_smr60.obj b/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne4_smr60.obj
new file mode 100644
index 0000000..c49488b
--- /dev/null
+++ b/advtrains_signals_ks/models/advtrains_signals_ks_sign_ne4_smr60.obj
@@ -0,0 +1,151 @@
+# Blender v3.0.0 OBJ File: ''
+# www.blender.org
+mtllib advtrains_signals_ks_sign_ne4_smr60.mtl
+o Cube.001
+v 0.335064 1.200000 -0.055317
+v 0.352963 1.200000 -0.064241
+v 0.263724 1.200000 -0.243228
+v 0.245825 1.200000 -0.234304
+v 0.352963 0.700000 -0.064241
+v 0.335064 0.700000 -0.055317
+v 0.263724 0.700000 -0.243228
+v 0.245825 0.700000 -0.234304
+v 0.301499 1.055075 -0.122605
+v 0.299626 1.055075 -0.149388
+v 0.299626 1.055075 -0.149388
+v 0.301499 1.055075 -0.122605
+v 0.252580 1.055075 -0.165129
+v 0.234966 1.055075 -0.144867
+v 0.234966 1.055075 -0.144867
+v 0.252580 1.055075 -0.165129
+v 0.257101 1.055075 -0.100469
+v 0.283885 1.055075 -0.102342
+v 0.283885 1.055075 -0.102342
+v 0.257101 1.055075 -0.100469
+v 0.279363 1.055075 -0.167002
+v 0.279363 1.055075 -0.167002
+v 0.236839 1.055075 -0.118084
+v 0.236839 1.055075 -0.118084
+v 0.257102 -0.499729 -0.100469
+v 0.283885 -0.499729 -0.102341
+v 0.236839 -0.499729 -0.118084
+v 0.301499 -0.499729 -0.122605
+v 0.299626 -0.499729 -0.149388
+v 0.234966 -0.499729 -0.144866
+v 0.279364 -0.499729 -0.167002
+v 0.252580 -0.499729 -0.165129
+vt 0.583333 0.750000
+vt 0.583333 0.500000
+vt 0.583333 0.250000
+vt 0.583333 1.000000
+vt 0.375000 1.000000
+vt 0.375000 0.750000
+vt 0.375000 0.500000
+vt 0.375000 0.000000
+vt 0.583333 0.000000
+vt 0.375000 0.250000
+vt 0.125000 0.500000
+vt 0.125000 0.750000
+vt 0.372863 0.578719
+vt 0.372317 0.613951
+vt 0.371666 0.613734
+vt 0.372221 0.578991
+vt 0.315877 0.640082
+vt 0.292344 0.614764
+vt 0.292986 0.614492
+vt 0.316131 0.639438
+vt 0.315346 0.553400
+vt 0.349331 0.553400
+vt 0.349077 0.554044
+vt 0.315664 0.554020
+vt 0.349861 0.640082
+vt 0.349543 0.639462
+vt 0.292889 0.579531
+vt 0.293541 0.579748
+vt 0.444102 0.636706
+vt 0.409596 0.636706
+vt 0.385196 0.612306
+vt 0.385196 0.577799
+vt 0.409596 0.553400
+vt 0.444102 0.553400
+vt 0.468502 0.577800
+vt 0.468502 0.612306
+vt 0.037160 1.987962
+vt 0.036793 0.000397
+vt 0.071486 0.000384
+vt 0.071853 1.987948
+vt 0.002468 1.987974
+vt 0.002100 0.000409
+vt 0.106546 1.987936
+vt 0.106179 0.000371
+vt 0.140872 0.000358
+vt 0.141239 1.987923
+vt 0.245318 1.987885
+vt 0.244951 0.000319
+vt 0.279643 0.000307
+vt 0.280011 1.987871
+vt 0.175932 1.987910
+vt 0.175565 0.000345
+vt 0.210258 0.000332
+vt 0.210625 1.987897
+vt 0.250000 0.375000
+vt 0.250000 1.000000
+vt 0.000000 1.000000
+vt 0.000000 0.375000
+vn 0.4123 0.3827 0.8268
+vn 0.8268 0.3826 -0.4123
+vn -0.4122 0.3827 -0.8269
+vn -0.8268 0.3827 0.4123
+vn -0.8949 -0.0000 0.4462
+vn 0.4462 0.0000 0.8949
+vn -0.4462 0.0000 -0.8949
+vn 0.3155 -0.7071 0.6328
+vn -0.3155 -0.7071 -0.6328
+vn -0.9769 0.0000 -0.2136
+vn 0.0000 0.0000 1.0000
+vn 0.9659 0.0000 0.2588
+vn -0.9659 0.0000 0.2588
+vn 0.9769 0.0000 0.2136
+vn -0.7817 -0.5674 0.2588
+vn 0.9659 0.0000 -0.2588
+vn -0.9659 0.0000 -0.2588
+vn 0.0000 1.0000 0.0000
+vn 0.0698 0.0000 0.9976
+vn -0.6561 -0.0000 0.7547
+vn 0.9976 0.0000 -0.0698
+vn 0.7547 0.0000 0.6561
+vn -0.9976 -0.0000 0.0698
+vn -0.0698 -0.0000 -0.9976
+vn -0.7547 -0.0000 -0.6561
+vn 0.6561 -0.0000 -0.7547
+vn 0.8949 0.0000 -0.4462
+g Cube.001_Cube.001_Default_OBJ
+usemtl Default_OBJ
+s off
+f 1/1/1 2/2/2 3/3/3 4/4/4
+f 1/1/5 4/4/5 8/5/5 6/6/5
+f 5/7/6 2/2/6 1/1/6 6/6/6
+f 8/8/7 4/9/7 3/3/7 7/10/7
+f 7/11/8 5/7/9 6/6/9 8/12/8
+s 1
+f 9/13/10 10/14/11 11/15/12 12/16/10
+f 13/17/13 14/18/14 15/19/14 16/20/15
+f 17/21/16 18/22/16 19/23/17 20/24/17
+f 10/14/11 21/25/13 22/26/12 11/15/12
+f 14/18/14 23/27/11 24/28/17 15/19/14
+f 18/22/16 9/13/10 12/16/10 19/23/17
+f 21/29/18 13/30/18 14/31/18 23/32/18 17/33/18 18/34/18 9/35/18 10/36/18
+f 20/37/19 25/38/19 26/39/19 19/40/19
+f 21/25/13 13/17/13 16/20/15 22/26/12
+f 23/27/11 17/21/16 20/24/17 24/28/17
+f 24/41/20 27/42/20 25/38/20 20/37/20
+f 12/43/21 28/44/21 29/45/21 11/46/21
+f 19/40/22 26/39/22 28/44/22 12/43/22
+f 15/47/23 30/48/23 27/49/23 24/50/23
+f 22/51/24 31/52/24 32/53/24 16/54/24
+f 16/54/25 32/53/25 30/48/25 15/47/25
+f 11/46/26 29/45/26 31/52/26 22/51/26
+g Cube.001_Cube.001_Anzeige
+usemtl Anzeige
+s off
+f 7/55/27 3/56/27 2/57/27 5/58/27
diff --git a/advtrains_signals_ks/textures/advtrains_signals_ks_mast.png b/advtrains_signals_ks/textures/advtrains_signals_ks_mast.png
index dbbee5d..81b1128 100644
--- a/advtrains_signals_ks/textures/advtrains_signals_ks_mast.png
+++ b/advtrains_signals_ks/textures/advtrains_signals_ks_mast.png
diff --git a/advtrains_signals_ks/textures/advtrains_signals_ks_sign_ne3x1.png b/advtrains_signals_ks/textures/advtrains_signals_ks_sign_ne3x1.png
new file mode 100644
index 0000000..19f860a
--- /dev/null
+++ b/advtrains_signals_ks/textures/advtrains_signals_ks_sign_ne3x1.png
diff --git a/advtrains_signals_ks/textures/advtrains_signals_ks_sign_ne3x2.png b/advtrains_signals_ks/textures/advtrains_signals_ks_sign_ne3x2.png
new file mode 100644
index 0000000..dd86d09
--- /dev/null
+++ b/advtrains_signals_ks/textures/advtrains_signals_ks_sign_ne3x2.png
diff --git a/advtrains_signals_ks/textures/advtrains_signals_ks_sign_ne3x3.png b/advtrains_signals_ks/textures/advtrains_signals_ks_sign_ne3x3.png
new file mode 100644
index 0000000..f343fc4
--- /dev/null
+++ b/advtrains_signals_ks/textures/advtrains_signals_ks_sign_ne3x3.png
diff --git a/advtrains_signals_ks/textures/advtrains_signals_ks_sign_ne3x4.png b/advtrains_signals_ks/textures/advtrains_signals_ks_sign_ne3x4.png
new file mode 100644
index 0000000..98c0248
--- /dev/null
+++ b/advtrains_signals_ks/textures/advtrains_signals_ks_sign_ne3x4.png
diff --git a/advtrains_signals_ks/textures/advtrains_signals_ks_sign_ne3x5.png b/advtrains_signals_ks/textures/advtrains_signals_ks_sign_ne3x5.png
new file mode 100644
index 0000000..d9d21bd
--- /dev/null
+++ b/advtrains_signals_ks/textures/advtrains_signals_ks_sign_ne3x5.png
diff --git a/advtrains_signals_ks/textures/advtrains_signals_ks_sign_ne4.png b/advtrains_signals_ks/textures/advtrains_signals_ks_sign_ne4.png
new file mode 100644
index 0000000..4efbe57
--- /dev/null
+++ b/advtrains_signals_ks/textures/advtrains_signals_ks_sign_ne4.png
diff --git a/modpack.conf b/modpack.conf
index e01f462..5185be4 100644
--- a/modpack.conf
+++ b/modpack.conf
@@ -2,3 +2,4 @@ name=advtrains
 title=Advanced Trains
 description=Realistic trains and various equipment for railways, with a focus on automated train operation. No trains included, please install those separately.
 author=orwell96
+min_minetest_version=5.4
\ No newline at end of file