changed deprecated signature to match with output of clirr
endfixed a minor bug