First round of updates for HW5