- Removed unneeded mutex
- Added check for thread on critical block rule