update of hw2 almost done