minor changes to complete threaded code (also WEAR side)