Updated loading
Updated image loading
merged