Added loading logic
merged