Updated HW4 to match Db changes