back to raj changes on predictor,utils,cfianl
conflict