UAR-625 - Adding modified code that completes this enhancment.