Attempt to improve drive logic