new user update
Merge branch 'matt'