[*** NON AT Genweb UPC ***] Updated to meet the new requirements agreed SC.