Change Disguisehandling system

WARNING: Could be unstable

Signed-off-by: Andre Schweiger <andre.spiele@yahoo.de>