Db1 upgrade

Longer term upgrade