update PR following Adam's comment