Added changes to speed up loading.