hw1 and hw2 added