adaptations to new db