Improved readability
Restored the UHS generation removed by accident