Address Sanjoy's review comments to r256326