Further speed up of loading.