refactoring
Fully refactored code
Multiloading turned off