reworking Db.stuff