Add updates for all parts of HW 3. So sorry it's late, Sam!