last changes before demo