tweaks to threading change