More thread safety
Better threading