Added some more multi threading