reworking the code for debugging, trying to remove the mess
Authored by: ruckert 2018-12-03
Parent: [r653]
Child: [r655]
