Revert "Revert "a bit more working""

This reverts commit 753f503bda763ca044e58162185849590f07b6c6.