Mod 6 last changes