Continued work on HW