Update after discussions with Brian.