improve ua

Change-Id: I40e56e1a18bdc52f8c35a6ffa5b5e28c8d0d6abd