20130929 merge---DB design update