U6A2 refactor