refactor 0.3.3