refactor predictor
changed todo