continue refactoring in favor of scal