futher work on database