added Car and Gate (NEED HEAVY OPTIMISATION)