Changes for fixed number of thread