Merge branch 'modify-views'