UAT Desktop code with enhancements