Added original patch file from Elaine