hopefully update should work now
Merge branch 'development'
updates
updated update method
Merge branch 'development'