update with HW6-1 bug fix