design change
Merge pull request #6 from niiicolai/system

design change