refactor spider-side, but the database is a no-go, changed DB