Swap to using the Mutex directly again. Smarter now