#1130 - Polished so the 3 uis are the same