added smoke and vehicle