refactor, add predictors