update patch based on Arthur's comments