Better drive (40/41)

Better drive