progress commit #81
Merge branch 'viewtoupdate'