Making adjustments to accommodate new set up of DB