More changes moving towards reducing the number of threads"