More db tweaking, think I got it