refactored loader
Successfully merge