More updates for hw6