Updated thread locking with CommandButcher