StateUpdater should be more reliable now

#340