123: outsys ms2
* refactoring