Refactoring US2