Loading

Refactoring