improve car picker
merge changes