rework almost finished, cars are more consistent