changed db structure to hopefully final stage for a while