More threading and safety