fixed up db design