Update app
Merge branch 'update-methods'