updated to hw2