Updates after video chat with Nicolas