Updated the diag center
Updated the diag center
Merge branch 'master' into brandon
Added support for brandon's changed files