Updated patch to include all files