modified database per new design