another update to DB design