my changes from scott
Merge remote-tracking branch 'origin'