after car refactoring
done some testing