made database much more logical