Updating original DOM patch to match latest code