Mod 2 today

Some last changes...