just turning classifiers on and off
fixing merge conflict