revised hw2
first draft