modify DB design by mike