refactor v.0.2.6