U6A2 refactored