Moving Google toward the mainline