Faster loading

v3.8.1