Fixed threading and broadcasting