Drive code improved