Tune input check in drive, also change to C++