changes with vin, basket and a lot others
Merge remote-tracking branch 'origin/master'
import error fix