refactored, added loader