U1A1 refactored