HW 4 improvement
HW8 WIP