not working
Revert "not working"

This reverts commit 7c7be980f8c51ec177c686c128192416c05cd592.
Revert "fixes"

This reverts commit c7d737e33005f0cf869e826e5c2cda8f5ad8184b.
some new bugs ;)