Refactoring
Refactored preload