Updated patch to work in context of other patches