db fix: step 1: completed