few changes with DB