Klondike update driver code to current git