Updated patch file with additional modifications