version 0.4.28, refactoring