UA refactor