sys refactoring (2)