2nd resubmit of hw1