Last changes before demo