start refactoring for ZSystem
refactoring in ZSystem
refactoring in ZSystem