Not using threading on some additional cases.