Updated to use UA only