Updated to reflect UAT comments on 11-4