Refactor 2.0