Mod 8 and 9 and continue to fix mod 5