HW6 More Improvements