hopefully last changes before showtime