More attempts to speed up with multi-threading