fixed update method to actually update
Merge branch 'user'