last changes before winning mock 2