HW3 with bugs
Hw3 changes