more db work ...