WIP for manually updated database (and revert to shipping database / new shipping database)