Moved logic from Simulation to vehicle