refactoring US1