Updated patch: