Hopefully the DB fields are close to ok, did them pretty quickly