Better, but still messed up database