More work done on HW1