Changes for Champs.
Merge remote-tracking branch 'origin/master'
Good default db.