updated for Showtime Redux