Drive code moved to base class