Added hw2 -- to be edited