Added more UAI