Fixed update function
Merge branch 'edit'
merging update fix