Mods to 7 and 8