Update to latest walk API