Updated to fix UAT issues