+stabilisation with new design
+check test
+logging (not worked)