Some more changes with threads