updating view and implements
Merge origin/master