updates to be on any view
updated —> change method name
Merge remote-tracking branch 'origin/master'