Better database

not really, but pretty much