Big update for demo day