Reorganize car checks to avoid overlapping controller issues