Refactor 2.1