Made trivia work fully