by konstantin.komelin: Improved update path.