Added the missing update option.
Merge branch 'refactored_ui' into topic/focus