A few last changes for tonight