HW2 Enhancements Done