Updated patch as requested