refactor 0.2