Start of HW4 mods