Updating to the new HW6 template