Stage3 last changes