HW 19 Added with modification/test code