accommodate method done + fixed database mismatching