Consolidate update() method
Merge branch 'master' of ../stage