Updated GuessIt