Merge branch 'now_view'