#21 modified db for request