refactor 0.6