Added method update
Merge branch 'screen-manager'