Removed multi-threading