Rework code for full loading.