refactoring #29
work on #29