refactor v0.1