v 0.0.1j beta
refactoring