UNTESTED: refactoring 1.0.0