database stuff
merged