last changes before validation