modified database, working on test