Seans changes
Another fix
New Merge branch 'seanmtracey-master'