Updated patch with Juri’s feedback.