Updating to take DW into account