- refactor v.1.2