change to new db commands