branch updated following Nats comments