adjustments for new DB