v 0.3.2 refactoring in process