HW6 Improvements