Added whitelist not to be reactivated
Added hasty option, to allow all classifications to be used