editing this for HW