Update & Improve guessing