WIP: Feedback from Andrea added

Signed-off-by: Erik Bernoth <bernoth@dresearch-fe.de>