refactor 0.0.4