Improved loading.