PIM-3420 : re-work update guesser