UPDATE FOR WORKING HW