Updates to threading