Semi-working
Revert "Semi-working"

This reverts commit fdee255822381ce0eb213db33753cf7367d0c634.