Added loading.
Merge