-- more work on UCCPAR-353