3.1.2 spinning loader, code refactoring