db should be fixed. not tested