Multithread stuff for 1.1.0.1