-- UCCPAR-431, removed white spaces