Added hw2 and macro