migrate to UET-only approach