almost done and updated db