Updated for UAR-422